Mercurial > hg > truffle
changeset 10275:d73c88e524ff
Merge
author | kvn |
---|---|
date | Fri, 03 May 2013 15:35:30 -0700 |
parents | 625ddb0052e1 (current diff) e76dd894b984 (diff) |
children | f0bc60565ba8 |
files | src/share/vm/classfile/classFileParser.cpp |
diffstat | 6 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jprt.properties Fri May 03 08:19:38 2013 -0700 +++ b/make/jprt.properties Fri May 03 15:35:30 2013 -0700 @@ -134,14 +134,14 @@ jprt.build.targets.standard= \ ${jprt.my.solaris.sparc}-{product|fastdebug}, \ - ${jprt.my.solaris.sparcv9}-{product|fastdebug}, \ + ${jprt.my.solaris.sparcv9}-{product|fastdebug|optimized}, \ ${jprt.my.solaris.i586}-{product|fastdebug}, \ ${jprt.my.solaris.x64}-{product|fastdebug}, \ ${jprt.my.linux.i586}-{product|fastdebug}, \ - ${jprt.my.linux.x64}-{product|fastdebug}, \ + ${jprt.my.linux.x64}-{product|fastdebug|optimized}, \ ${jprt.my.macosx.x64}-{product|fastdebug}, \ ${jprt.my.windows.i586}-{product|fastdebug}, \ - ${jprt.my.windows.x64}-{product|fastdebug}, \ + ${jprt.my.windows.x64}-{product|fastdebug|optimized}, \ ${jprt.my.linux.armvh}-{product|fastdebug} jprt.build.targets.open= \
--- a/src/share/vm/classfile/classFileParser.cpp Fri May 03 08:19:38 2013 -0700 +++ b/src/share/vm/classfile/classFileParser.cpp Fri May 03 15:35:30 2013 -0700 @@ -3028,7 +3028,7 @@ } -#ifndef PRODUCT +#ifdef ASSERT static void parseAndPrintGenericSignatures( instanceKlassHandle this_klass, TRAPS) { assert(ParseAllGenericSignatures == true, "Shouldn't call otherwise"); @@ -3053,7 +3053,7 @@ } } } -#endif // ndef PRODUCT +#endif // def ASSERT instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,
--- a/src/share/vm/classfile/vmSymbols.cpp Fri May 03 08:19:38 2013 -0700 +++ b/src/share/vm/classfile/vmSymbols.cpp Fri May 03 15:35:30 2013 -0700 @@ -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 Fri May 03 08:19:38 2013 -0700 +++ b/src/share/vm/opto/runtime.cpp Fri May 03 15:35:30 2013 -0700 @@ -126,17 +126,15 @@ // 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 +#endif // ASSERT #define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \
--- a/src/share/vm/utilities/quickSort.cpp Fri May 03 08:19:38 2013 -0700 +++ b/src/share/vm/utilities/quickSort.cpp Fri May 03 15:35:30 2013 -0700 @@ -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;
--- a/test/compiler/8009761/Test8009761.java Fri May 03 08:19:38 2013 -0700 +++ b/test/compiler/8009761/Test8009761.java Fri May 03 15:35:30 2013 -0700 @@ -25,7 +25,7 @@ * @test * @bug 8009761 * @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates - * @run main/othervm -Xmixed -XX:-UseOnStackReplacement -XX:-BackgroundCompilation Test8009761 + * @run main/othervm -XX:CompileCommand=exclude,Test8009761::m2 -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -Xss256K Test8009761 * */ @@ -249,7 +249,7 @@ System.out.println("Failed: init recursive calls: " + c1 + ". After deopt " + count); System.exit(97); } else { - System.out.println("PASSED"); + System.out.println("PASSED " + c1); } } }