summaryrefslogtreecommitdiff
path: root/runtime/interpreter/interpreter_switch_impl.cc
diff options
context:
space:
mode:
author Sebastien Hertz <shertz@google.com> 2015-04-03 16:07:05 +0200
committer Sebastien Hertz <shertz@google.com> 2015-04-03 16:27:19 +0200
commit45b1597c152af90f6d5792d02b64fd4e7c81ac9d (patch)
tree3cbb498c91067657169e4ee2aaba9cbf286e3788 /runtime/interpreter/interpreter_switch_impl.cc
parentd43f160dc294655885a2c273307d34585c4ce97b (diff)
Use va_list argument to abort transaction
Creates AbortTransactionV taking a va_list argument and renames AbortTransaction to AbortTransactionF which calls AbortTransactionV. This fixes the compiler_driver_test under valgrind. Change-Id: Ia1c57330091c055ae9e46585a944ce0b78864920
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
-rw-r--r--runtime/interpreter/interpreter_switch_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc
index 609faf5b5d..fe7ad770af 100644
--- a/runtime/interpreter/interpreter_switch_impl.cc
+++ b/runtime/interpreter/interpreter_switch_impl.cc
@@ -438,8 +438,8 @@ JValue ExecuteSwitchImpl(Thread* self, const DexFile::CodeItem* code_item,
// Don't allow finalizable objects to be allocated during a transaction since these can't
// be finalized without a started runtime.
if (transaction_active && obj->GetClass()->IsFinalizable()) {
- AbortTransaction(self, "Allocating finalizable object in transaction: %s",
- PrettyTypeOf(obj).c_str());
+ AbortTransactionF(self, "Allocating finalizable object in transaction: %s",
+ PrettyTypeOf(obj).c_str());
HANDLE_PENDING_EXCEPTION();
break;
}