Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorroland
Fri, 16 Oct 2015 16:09:00 +0000
changeset 33197 ad4d16358294
parent 33195 43b1272dbac7 (diff)
parent 33196 3d84eedbd82c (current diff)
child 33198 b37ad9fbf681
Merge
--- a/hotspot/src/share/vm/utilities/vmError.cpp	Fri Oct 16 15:48:18 2015 +0200
+++ b/hotspot/src/share/vm/utilities/vmError.cpp	Fri Oct 16 16:09:00 2015 +0000
@@ -520,6 +520,8 @@
 #if INCLUDE_JVMCI
                    EnableJVMCI ? ", jvmci" : "",
                    UseJVMCICompiler ? ", jvmci compiler" : "",
+#else
+                   "", "",
 #endif
                    UseCompressedOops ? ", compressed oops" : "",
                    gc_mode(),
jdk-sandbox