summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver_test.cc
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-12-21 12:15:39 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-21 12:15:39 -0800
commit6b1a50b561d3f1a282871f30e85e74433e2984af (patch)
treee592e69ddea871126d566fcaf5b3309a5c2e8643 /compiler/driver/compiler_driver_test.cc
parent28ee8dbece62bf1ed9a7dfd3c581fd5860ed8867 (diff)
parent8a5e8d0118de17210316100e740d0417239256e9 (diff)
Merge "Rename NullHandle to ScopedNullHandle" am: 76b90e37df
am: 8a5e8d0118 * commit '8a5e8d0118de17210316100e740d0417239256e9': Rename NullHandle to ScopedNullHandle
Diffstat (limited to 'compiler/driver/compiler_driver_test.cc')
-rw-r--r--compiler/driver/compiler_driver_test.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc
index 462c511a83..82c0e86b25 100644
--- a/compiler/driver/compiler_driver_test.cc
+++ b/compiler/driver/compiler_driver_test.cc
@@ -149,9 +149,14 @@ TEST_F(CompilerDriverTest, DISABLED_AbstractMethodErrorStub) {
jobject class_loader;
{
ScopedObjectAccess soa(Thread::Current());
- CompileVirtualMethod(NullHandle<mirror::ClassLoader>(), "java.lang.Class", "isFinalizable",
+ CompileVirtualMethod(ScopedNullHandle<mirror::ClassLoader>(),
+ "java.lang.Class",
+ "isFinalizable",
"()Z");
- CompileDirectMethod(NullHandle<mirror::ClassLoader>(), "java.lang.Object", "<init>", "()V");
+ CompileDirectMethod(ScopedNullHandle<mirror::ClassLoader>(),
+ "java.lang.Object",
+ "<init>",
+ "()V");
class_loader = LoadDex("AbstractMethod");
}
ASSERT_TRUE(class_loader != nullptr);