1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc
index ced94f43f0..27eabafb8f 100644
--- a/compiler/optimizing/code_generator.cc
+++ b/compiler/optimizing/code_generator.cc
@@ -1081,6 +1081,11 @@ CodeGenerator::CodeGenerator(HGraph* graph,
       }
     }
   }
+  if (GetGraph()->IsCompilingBaseline()) {
+    // We need the current method in case we reach the hotness threshold. As a
+    // side effect this makes the frame non-empty.
+    SetRequiresCurrentMethod();
+  }
 }
 
 CodeGenerator::~CodeGenerator() {}