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

8012292: optimized build with GCC broken

Browse source 
Some #ifndef PRODUCT should be #ifdef ASSERT

Reviewed-by: kvn, twisti
This commit is contained in:
Gilles Duboscq 2013-04-24 14:26:09 +02:00 • committed by Roland Westrelin
parent 20b5d3aa4f
commit 34da1742ef
5 changed files with 11 additions and 11 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.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= \

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

@ -3046,7 +3046,7 @@ AnnotationArray* ClassFileParser::assemble_annotations(u1* runtime_visible_annot
}
#ifndef PRODUCT
#ifdef ASSERT
static void parseAndPrintGenericSignatures(
instanceKlassHandle this_klass, TRAPS) {
assert(ParseAllGenericSignatures == true, "Shouldn't call otherwise");
@ -3071,7 +3071,7 @@ static void parseAndPrintGenericSignatures(
}
}
}
#endif // ndef PRODUCT
#endif // def ASSERT
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"
static const char* vm_symbol_enum_names =
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;
}
#endif //PRODUCT
#endif //ASSERT
// Put all the VM symbol strings in one place.
// 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
// 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) \

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

@ -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 @@ static int test_comparator(int a, int b) {
}
return 1;
}
#endif // ASSERT
static int test_even_odd_comparator(int a, int b) {
bool a_is_odd = (a % 2) == 1;