Merge SP1A.200921.001

Change-Id: I9b9b56abc6922485810f13d3aae0f8e09b982779

1 files changed, 6 insertions, 9 deletions

diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h
index f873e7514e..9d15f1f294 100644
--- a/compiler/optimizing/codegen_test_utils.h
+++ b/compiler/optimizing/codegen_test_utils.h
@@ -223,15 +223,12 @@ static void VerifyGeneratedCode(InstructionSet target_isa,
                                 Expected expected) {
   ASSERT_TRUE(CanExecute(target_isa)) << "Target isa is not executable.";
 
-  // Simulator cannot run without runtime, because it needs quick entrypoints.
-  if (Runtime::Current() != nullptr) {
-    // Verify on simulator.
-    CodeSimulatorContainer simulator(target_isa);
-    if (simulator.CanSimulate()) {
-      Expected result = SimulatorExecute<Expected>(simulator.Get(), f);
-      if (has_result) {
-        ASSERT_EQ(expected, result);
-      }
+  // Verify on simulator.
+  CodeSimulatorContainer simulator(target_isa);
+  if (simulator.CanSimulate()) {
+    Expected result = SimulatorExecute<Expected>(simulator.Get(), f);
+    if (has_result) {
+      ASSERT_EQ(expected, result);
     }
   }