Latest merge into metropolis repo created issues due to incorrect auto-merge.

On 5/10/19 11:56 AM, Bob Vandette wrote:
> I just updated to the latest Metropolis sources and I’m not getting a lot of compilation failures.
>
> jvmciRuntime.cpp:
>
>
> JVM_ENTRY_NO_ENV(void, JVM_RegisterJVMCINatives(JNIEnv *env, jclass c2vmClass))
>
> #ifdef _LP64
> #ifndef TARGET_ARCH_sparc
> uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
> uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024;
> guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)");
> #endif // TARGET_ARCH_sparc
> #else
> fatal("check TLAB allocation code for address space conflicts");
> #endif
>
> JNI_JVMCIENV(env); <—————— Why are there two
>
> JNI_JVMCIENV(thread, env);
>
> open/src/hotspot/share/jvmci/jvmciRuntime.cpp:917:19: error: macro "JNI_JVMCIENV" requires 2 arguments, but only 1 given
> JNI_JVMCIENV(env);
> ^
>
>
> And I’m getting a lot of previously declared …
>
> open/src/hotspot/share/jvmci/jvmciEnv.cpp:131:17: error: redeclaration of ‘TempNewSymbol serializeSavedProperties’
> TempNewSymbol serializeSavedProperties = SymbolTable::new_symbol("serializeSa
> vedProperties", CHECK_EXIT);
> ^