Mercurial > hg > truffle
changeset 9160:f2aebc22372a
Fix hotspot optimized build
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 16 Apr 2013 17:17:22 +0200 |
parents | 43223d3f5dcd |
children | 8d4174140745 |
files | src/share/vm/classfile/classFileParser.cpp src/share/vm/classfile/vmSymbols.cpp src/share/vm/opto/runtime.cpp src/share/vm/utilities/quickSort.cpp |
diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/classFileParser.cpp Tue Apr 16 17:39:46 2013 +0200 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Apr 16 17:17:22 2013 +0200 @@ -3041,7 +3041,7 @@ } -#ifndef PRODUCT +#ifdef ASSERT static void parseAndPrintGenericSignatures( instanceKlassHandle this_klass, TRAPS) { assert(ParseAllGenericSignatures == true, "Shouldn't call otherwise"); @@ -3066,7 +3066,7 @@ } } } -#endif // ndef PRODUCT +#endif // ASSERT instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,
--- a/src/share/vm/classfile/vmSymbols.cpp Tue Apr 16 17:39:46 2013 +0200 +++ b/src/share/vm/classfile/vmSymbols.cpp Tue Apr 16 17:17:22 2013 +0200 @@ -49,7 +49,7 @@ } } -#ifndef PRODUCT +#ifdef ASSERT #define VM_SYMBOL_ENUM_NAME_BODY(name, string) #name "\0" static const char* vm_symbol_enum_names = VM_SYMBOLS_DO(VM_SYMBOL_ENUM_NAME_BODY, VM_ALIAS_IGNORE) @@ -64,7 +64,7 @@ } return string; } -#endif //PRODUCT +#endif //ASSERT // Put all the VM symbol strings in one place. // Makes for a more compact libjvm.
--- a/src/share/vm/opto/runtime.cpp Tue Apr 16 17:39:46 2013 +0200 +++ b/src/share/vm/opto/runtime.cpp Tue Apr 16 17:17:22 2013 +0200 @@ -126,14 +126,12 @@ // This should be called in an assertion at the start of OptoRuntime routines // which are entered from compiled code (all of them) -#ifndef PRODUCT +#ifdef ASSERT static bool check_compiled_frame(JavaThread* thread) { assert(thread->last_frame().is_runtime_frame(), "cannot call runtime directly from compiled code"); -#ifdef ASSERT RegisterMap map(thread, false); frame caller = thread->last_frame().sender(&map); assert(caller.is_compiled_frame(), "not being called from compiled like code"); -#endif /* ASSERT */ return true; } #endif
--- a/src/share/vm/utilities/quickSort.cpp Tue Apr 16 17:39:46 2013 +0200 +++ b/src/share/vm/utilities/quickSort.cpp Tue Apr 16 17:17:22 2013 +0200 @@ -32,6 +32,7 @@ #include "utilities/quickSort.hpp" #include <stdlib.h> +#ifdef ASSERT static int test_comparator(int a, int b) { if (a == b) { return 0; @@ -41,6 +42,7 @@ } return 1; } +#endif // ASSERT static int test_even_odd_comparator(int a, int b) { bool a_is_odd = (a % 2) == 1;