Changeset 210 for trunk

Timestamp:

Dec 14, 2010, 1:47:10 PM (15 years ago)

Author:

dmik

Message:

hotspot: Make sure JVM_GetLastErrorString()'s own debug statements don't hide actual last error messages in debug builds.

File:

• trunk/openjdk/hotspot/src/share/vm/prims/jvm.cpp (modified) (2 diffs)

trunk/openjdk/hotspot/src/share/vm/prims/jvm.cpp

@@ -595 +595 @@
 // Error message support //////////////////////////////////////////////////////
 
+// JVM_GetLastErrorString is special: it should return the platform last error
+// message which may get changed by NoHandleMark methods due to platform API
+// calls but the original error message seems to be more useful than marking
+// with NoHandleMark here, so temporarily disable it. Affects only debug builds.
+// TODO: Maybe drop JVM_LEAF at all and use the plain function def instead?
+#ifdef ASSERT
+# undef debug_only
+# define debug_only(x)
+#endif
+
 JVM_LEAF(jint, JVM_GetLastErrorString(char *buf, int len))
   JVMWrapper("JVM_GetLastErrorString");
@@ -600 +610 @@
 JVM_END
 
+#ifdef ASSERT
+# undef debug_only
+# define debug_only(x) x
+#endif
 
 // java.io.File ///////////////////////////////////////////////////////////////