Merge changes I6407c9b4,I49d9da67

* changes:
  Revert "Allow deoptimization when returning from a runtime method."
  Revert "Fix some issues for deoptimizing runtime methods."

1 files changed, 1 insertions, 17 deletions

diff --git a/runtime/instrumentation_test.cc b/runtime/instrumentation_test.cc
index bfd36cc11c..d25655f15a 100644
--- a/runtime/instrumentation_test.cc
+++ b/runtime/instrumentation_test.cc
@@ -473,23 +473,7 @@ TEST_F(InstrumentationTest, NoInstrumentation) {
 
 // Test instrumentation listeners for each event.
 TEST_F(InstrumentationTest, MethodEntryEvent) {
-  ScopedObjectAccess soa(Thread::Current());
-  jobject class_loader = LoadDex("Instrumentation");
-  Runtime* const runtime = Runtime::Current();
-  ClassLinker* class_linker = runtime->GetClassLinker();
-  StackHandleScope<1> hs(soa.Self());
-  Handle<mirror::ClassLoader> loader(hs.NewHandle(soa.Decode<mirror::ClassLoader>(class_loader)));
-  mirror::Class* klass = class_linker->FindClass(soa.Self(), "LInstrumentation;", loader);
-  ASSERT_TRUE(klass != nullptr);
-  ArtMethod* method =
-      klass->FindClassMethod("returnReference", "()Ljava/lang/Object;", kRuntimePointerSize);
-  ASSERT_TRUE(method != nullptr);
-  ASSERT_TRUE(method->IsDirect());
-  ASSERT_TRUE(method->GetDeclaringClass() == klass);
-  TestEvent(instrumentation::Instrumentation::kMethodEntered,
-            /*event_method*/ method,
-            /*event_field*/ nullptr,
-            /*with_object*/ true);
+  TestEvent(instrumentation::Instrumentation::kMethodEntered);
 }
 
 TEST_F(InstrumentationTest, MethodExitObjectEvent) {