diff options
| author | 2016-10-20 14:41:18 +0000 | |
|---|---|---|
| committer | 2016-10-20 14:41:18 +0000 | |
| commit | 024662a3102df92fabf4f40d9ec40976f8e20c5d (patch) | |
| tree | 248a072ebfa8e3a7897ad08f819456f28e47c0bc /compiler/utils | |
| parent | 4a4ff643b629b268787fb97648116e1ac391f53b (diff) | |
| parent | af1e2990cd1406a0fb7cba1d2e208208e950e413 (diff) | |
Merge changes I16f8b7ec,I075bbf55
* changes:
jni: Support @FastNative methods that return objects
Revert "jni: Disable FastNative path for methods returning objects"
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/assembler_thumb_test.cc | 2 | ||||
| -rw-r--r-- | compiler/utils/assembler_thumb_test_expected.cc.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/assembler_thumb_test.cc b/compiler/utils/assembler_thumb_test.cc index 86a4aa2245..10bed13dad 100644 --- a/compiler/utils/assembler_thumb_test.cc +++ b/compiler/utils/assembler_thumb_test.cc @@ -158,7 +158,7 @@ void DumpAndCheck(std::vector<uint8_t>& code, const char* testname, const char* } if (CompareIgnoringSpace(results[lineindex], testline) != 0) { LOG(FATAL) << "Output is not as expected at line: " << lineindex - << results[lineindex] << "/" << testline; + << results[lineindex] << "/" << testline << ", test name: " << testname; } ++lineindex; } diff --git a/compiler/utils/assembler_thumb_test_expected.cc.inc b/compiler/utils/assembler_thumb_test_expected.cc.inc index 91f397087c..69e1d8f6fa 100644 --- a/compiler/utils/assembler_thumb_test_expected.cc.inc +++ b/compiler/utils/assembler_thumb_test_expected.cc.inc @@ -5544,7 +5544,7 @@ const char* const VixlJniHelpersResults[] = { " 10c: ecbd 8a10 vpop {s16-s31}\n", " 110: e8bd 8de0 ldmia.w sp!, {r5, r6, r7, r8, sl, fp, pc}\n", " 114: 4660 mov r0, ip\n", - " 116: f8d9 c2ac ldr.w ip, [r9, #684] ; 0x2ac\n", + " 116: f8d9 c2b0 ldr.w ip, [r9, #688] ; 0x2b0\n", " 11a: 47e0 blx ip\n", nullptr }; |