Mercurial > hg > truffle
changeset 15514:77eca555014f
Merge (gate: make unittests verbose)
| author | Lukas Stadler <lukas.stadler@oracle.com> |
|---|---|
| date | Mon, 05 May 2014 18:45:03 +0200 |
| parents | 130e0183b7e2 (current diff) d250613801fb (diff) |
| children | fbe9e7088e35 |
| files | |
| diffstat | 4 files changed, 4 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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']:
--- 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) {
--- 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
--- 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 ;