archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Vladimir Kozlov 2013-05-03 15:35:30 -07:00
commit 1763afaec5
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/make/jprt.properties
View file

@ -134,14 +134,14 @@ jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
jprt.build.targets.standard= \ jprt.build.targets.standard= \
${jprt.my.solaris.sparc}-{product|fastdebug}, \ ${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.i586}-{product|fastdebug}, \
${jprt.my.solaris.x64}-{product|fastdebug}, \ ${jprt.my.solaris.x64}-{product|fastdebug}, \
${jprt.my.linux.i586}-{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.macosx.x64}-{product|fastdebug}, \
${jprt.my.windows.i586}-{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.my.linux.armvh}-{product|fastdebug}
jprt.build.targets.open= \ jprt.build.targets.open= \

4
hotspot/src/share/vm/classfile/classFileParser.cpp
View file

@ -3028,7 +3028,7 @@ AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annot
} }
#ifndef PRODUCT #ifdef ASSERT
static void parseAndPrintGenericSignatures( static void parseAndPrintGenericSignatures(
instanceKlassHandle this_klass, TRAPS) { instanceKlassHandle this_klass, TRAPS) {
assert(ParseAllGenericSignatures == true, "Shouldn't call otherwise"); assert(ParseAllGenericSignatures == true, "Shouldn't call otherwise");
@ -3053,7 +3053,7 @@ static void parseAndPrintGenericSignatures(
} }
} }
} }
#endif // ndef PRODUCT #endif // def ASSERT
instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index, instanceKlassHandle ClassFileParser::parse_super_class(int super_class_index,

4
hotspot/src/share/vm/classfile/vmSymbols.cpp
View file

@ -49,7 +49,7 @@ extern "C" {
} }
} }
#ifndef PRODUCT #ifdef ASSERT
#define VM_SYMBOL_ENUM_NAME_BODY(name, string) #name "\0" #define VM_SYMBOL_ENUM_NAME_BODY(name, string) #name "\0"
static const char* vm_symbol_enum_names = static const char* vm_symbol_enum_names =
VM_SYMBOLS_DO(VM_SYMBOL_ENUM_NAME_BODY, VM_ALIAS_IGNORE) VM_SYMBOLS_DO(VM_SYMBOL_ENUM_NAME_BODY, VM_ALIAS_IGNORE)
@ -64,7 +64,7 @@ static const char* vm_symbol_enum_name(vmSymbols::SID sid) {
} }
return string; return string;
} }
#endif //PRODUCT #endif //ASSERT
// Put all the VM symbol strings in one place. // Put all the VM symbol strings in one place.
// Makes for a more compact libjvm. // Makes for a more compact libjvm.

6
hotspot/src/share/vm/opto/runtime.cpp
View file

@ -126,17 +126,15 @@ ExceptionBlob* OptoRuntime::_exception_blob;
// This should be called in an assertion at the start of OptoRuntime routines // This should be called in an assertion at the start of OptoRuntime routines
// which are entered from compiled code (all of them) // which are entered from compiled code (all of them)
#ifndef PRODUCT #ifdef ASSERT
static bool check_compiled_frame(JavaThread* thread) { static bool check_compiled_frame(JavaThread* thread) {
assert(thread->last_frame().is_runtime_frame(), "cannot call runtime directly from compiled code"); assert(thread->last_frame().is_runtime_frame(), "cannot call runtime directly from compiled code");
#ifdef ASSERT
RegisterMap map(thread, false); RegisterMap map(thread, false);
frame caller = thread->last_frame().sender(&map); frame caller = thread->last_frame().sender(&map);
assert(caller.is_compiled_frame(), "not being called from compiled like code"); assert(caller.is_compiled_frame(), "not being called from compiled like code");
#endif /* ASSERT */
return true; return true;
} }
#endif #endif // ASSERT
#define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \ #define gen(env, var, type_func_gen, c_func, fancy_jump, pass_tls, save_arg_regs, return_pc) \

2
hotspot/src/share/vm/utilities/quickSort.cpp
View file

@ -32,6 +32,7 @@
#include "utilities/quickSort.hpp" #include "utilities/quickSort.hpp"
#include <stdlib.h> #include <stdlib.h>
#ifdef ASSERT
static int test_comparator(int a, int b) { static int test_comparator(int a, int b) {
if (a == b) { if (a == b) {
return 0; return 0;
@ -41,6 +42,7 @@ static int test_comparator(int a, int b) {
} }
return 1; return 1;
} }
#endif // ASSERT
static int test_even_odd_comparator(int a, int b) { static int test_even_odd_comparator(int a, int b) {
bool a_is_odd = (a % 2) == 1; bool a_is_odd = (a % 2) == 1;

4
hotspot/test/compiler/8009761/Test8009761.java
View file

@ -25,7 +25,7 @@
* @test * @test
* @bug 8009761 * @bug 8009761
* @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates * @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 @@ public class Test8009761 {
System.out.println("Failed: init recursive calls: " + c1 + ". After deopt " + count); System.out.println("Failed: init recursive calls: " + c1 + ". After deopt " + count);
System.exit(97); System.exit(97);
} else { } else {
System.out.println("PASSED"); System.out.println("PASSED " + c1);
} }
} }
} }