From 9638191f2aa4f6276048a80b34a87c53ea69af5d Mon Sep 17 00:00:00 2001
From: Jordan DeLong <jdelong@fb.com>
Date: Mon, 27 May 2013 13:19:20 -0700
Subject: [PATCH] Remove emitInterpOneOrPunt

It just calls emitInterpOne now.
---
 .../vm/translator/hopt/hhbctranslator.cpp     | 23 ++++++++-----------
 .../vm/translator/hopt/hhbctranslator.h       |  1 -
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
index f8e875237..2f5841f32 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp
@@ -468,7 +468,7 @@ void HhbcTranslator::emitAddElemC() {
 
 void HhbcTranslator::emitAddNewElemC() {
   if (!topC(1)->isA(Type::Arr)) {
-    return emitInterpOneOrPunt(Type::Arr, 2, 0);
+    return emitInterpOne(Type::Arr, 2, 0);
   }
 
   auto const val = popC();
@@ -478,15 +478,15 @@ void HhbcTranslator::emitAddNewElemC() {
 }
 
 void HhbcTranslator::emitNewCol(int type, int numElems) {
-  emitInterpOneOrPunt(Type::Obj, 0);
+  emitInterpOne(Type::Obj, 0);
 }
 
 void HhbcTranslator::emitColAddElemC() {
-  emitInterpOneOrPunt(Type::Obj, 3);
+  emitInterpOne(Type::Obj, 3);
 }
 
 void HhbcTranslator::emitColAddNewElemC() {
-  emitInterpOneOrPunt(Type::Obj, 2);
+  emitInterpOne(Type::Obj, 2);
 }
 
 void HhbcTranslator::emitCns(uint32_t id) {
@@ -559,11 +559,11 @@ void HhbcTranslator::emitConcat() {
 }
 
 void HhbcTranslator::emitDefCls(int cid, Offset after) {
-  emitInterpOneOrPunt(Type::None, 0);
+  emitInterpOne(Type::None, 0);
 }
 
 void HhbcTranslator::emitDefFunc(int fid) {
-  emitInterpOneOrPunt(Type::None, 0);
+  emitInterpOne(Type::None, 0);
 }
 
 void HhbcTranslator::emitLateBoundCls() {
@@ -774,7 +774,7 @@ void HhbcTranslator::emitSetOpL(Opcode subOpc, uint32_t id) {
 }
 
 void HhbcTranslator::emitClassExists(const StringData* clsName) {
-  emitInterpOneOrPunt(Type::Bool, 2);
+  emitInterpOne(Type::Bool, 2);
 }
 
 void HhbcTranslator::emitInterfaceExists(const StringData* ifaceName) {
@@ -1157,7 +1157,7 @@ void HhbcTranslator::emitArrayIdx() {
   }
   if (UNLIKELY(
         !(keyType.subtypeOf(Type::Int) || keyType.subtypeOf(Type::Str)))) {
-    emitInterpOneOrPunt(Type::Cell, 3);
+    emitInterpOne(Type::Cell, 3);
     return;
   }
 
@@ -2410,7 +2410,7 @@ void HhbcTranslator::emitVerifyParamType(int32_t paramId) {
    * For now we just interp that case.
    */
   if (!locType.isObj()) {
-    emitInterpOneOrPunt(Type::None, 0);
+    emitInterpOne(Type::None, 0);
     return;
   }
 
@@ -3025,11 +3025,6 @@ void HhbcTranslator::emitInterpOneCF(int numPopped) {
   m_hasExit = true;
 }
 
-void HhbcTranslator::emitInterpOneOrPunt(Type type, int numPopped,
-                                         int numExtraPushed) {
-  emitInterpOne(type, numPopped, numExtraPushed);
-}
-
 /*
  * Get SSATmps representing all the information on the virtual eval
  * stack in preparation for a spill or exit trace.
diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.h b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
index 4bc5c6bc7..8c047b020 100644
--- a/hphp/runtime/vm/translator/hopt/hhbctranslator.h
+++ b/hphp/runtime/vm/translator/hopt/hhbctranslator.h
@@ -554,7 +554,6 @@ private:
   SSATmp* emitJmpCondHelper(int32_t offset, bool negate, SSATmp* src);
   SSATmp* emitIncDec(bool pre, bool inc, SSATmp* src);
   SSATmp* getMemberAddr(const char* vectorDesc, Trace* exitTrace);
-  void emitInterpOneOrPunt(Type type, int numPopped, int numExtraPushed = 0);
   void emitBinaryArith(Opcode);
   template<class Lambda>
   SSATmp* emitIterInitCommon(int offset, Lambda genFunc);