# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1399308303 -7200
# Node ID 77eca555014fdb0519d010e6418d5203fca21ad7
# Parent  130e0183b7e2569950e9288770eec99c22eeb3ab# Parent  d250613801fb39cb93d730cf6184ca5c487ff627
Merge (gate: make unittests verbose)

diff -r 130e0183b7e2 -r 77eca555014f mx/mx_graal.py
--- a/mx/mx_graal.py	Mon May 05 18:40:13 2014 +0200
+++ b/mx/mx_graal.py	Mon May 05 18:45:03 2014 +0200
@@ -1168,12 +1168,12 @@
 
     with VM('server', 'product'):  # hosted mode
         t = Task('UnitTests:hosted-product')
-        unittest([])
+        unittest(['--enable-timing', '--verbose'])
         tasks.append(t.stop())
 
     with VM('server', 'product'):  # hosted mode
         t = Task('UnitTests-BaselineCompiler:hosted-product')
-        unittest(['--whitelist', 'test/whitelist_baseline.txt', '-G:+UseBaselineCompiler'])
+        unittest(['--enable-timing', '--verbose', '--whitelist', 'test/whitelist_baseline.txt', '-G:+UseBaselineCompiler'])
         tasks.append(t.stop())
 
     for vmbuild in ['fastdebug', 'product']:
diff -r 130e0183b7e2 -r 77eca555014f src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Mon May 05 18:40:13 2014 +0200
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Mon May 05 18:45:03 2014 +0200
@@ -107,10 +107,6 @@
   return Address(rsp,  Interpreter::expr_offset_in_bytes(2));
 }
 
-static inline Address at_tos_p3() {
-  return Address(rsp,  Interpreter::expr_offset_in_bytes(3));
-}
-
 // Condition conversion
 static Assembler::Condition j_not(TemplateTable::Condition cc) {
   switch (cc) {
diff -r 130e0183b7e2 -r 77eca555014f src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Mon May 05 18:40:13 2014 +0200
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Mon May 05 18:45:03 2014 +0200
@@ -2790,6 +2790,7 @@
   return true;
 }
 
+#ifdef ASSERT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2804,6 +2805,7 @@
     return false;
   }
 }
+#endif // #ifdef ASSERT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
diff -r 130e0183b7e2 -r 77eca555014f src/share/vm/runtime/mutex.cpp
--- a/src/share/vm/runtime/mutex.cpp	Mon May 05 18:40:13 2014 +0200
+++ b/src/share/vm/runtime/mutex.cpp	Mon May 05 18:45:03 2014 +0200
@@ -280,16 +280,6 @@
   return x & 0x7FFFFFFF ;
 }
 
-static inline jint MarsagliaXOR (jint * const a) {
-  jint x = *a ;
-  if (x == 0) x = UNS(a)|1 ;
-  x ^= x << 6;
-  x ^= ((unsigned)x) >> 21;
-  x ^= x << 7 ;
-  *a = x ;
-  return x & 0x7FFFFFFF ;
-}
-
 static int Stall (int its) {
   static volatile jint rv = 1 ;
   volatile int OnFrame = 0 ;