Revert D64702800

Summary:
This diff reverts D64702800
Seeing logs in logview

Reviewed By: voorka

Differential Revision: D65148746

fbshipit-source-id: b4701cf355cb0f98b17329716420f51e1f626871

hphp/runtime/base/intercept.cpp

@@ -144,8 +144,7 @@ bool register_intercept(const String& name, const Variant& callback) {
       if (!meth || meth->cls() != cls) return nullptr;
       return meth;
     } else {
-      auto const f = Func::load(name.get());
-      return f->unwrap();
+      return Func::load(name.get());
     }
   }();
 

hphp/runtime/base/runtime-option.h

@@ -926,7 +926,7 @@ struct RuntimeOption {
   F(bool, FastMethodIntercept, false)                                   \
   F(bool, LogHttpServerSignalSource, true)                              \
   F(bool, CrashOnStaticAnalysisError, debug)                            \
-  F(bool, ReplaceTrivialBuiltins, true)                                 \
+  F(bool, ReplaceTrivialBuiltins, false)                                \
   /* */
 
 private:

hphp/runtime/vm/bytecode.cpp

@@ -3902,13 +3902,10 @@ OPTBLD_INLINE JitResumeAddr iopFCallFunc(bool retToJit, PC origpc, PC& pc,
 OPTBLD_INLINE JitResumeAddr iopFCallFuncD(bool retToJit, PC origpc, PC& pc,
                                           FCallArgs fca, Id id) {
   auto const nep = vmfp()->unit()->lookupNamedFuncPairId(id);
-  auto const func = [&]() {
-    auto const f = Func::resolve(nep.second, nep.first, vmfp()->func());
-    if (UNLIKELY(f == nullptr)) {
-      raise_call_to_undefined(vmfp()->unit()->lookupLitstrId(id));
-    }
-    return f->unwrap();
-  }();
+  auto const func = Func::resolve(nep.second, nep.first, vmfp()->func());
+  if (UNLIKELY(func == nullptr)) {
+    raise_call_to_undefined(vmfp()->unit()->lookupLitstrId(id));
+  }
 
   return fcallImpl<false>(retToJit, origpc, pc, fca, func, NoCtx{});
 }

hphp/runtime/vm/func-emitter.cpp

@@ -222,7 +222,7 @@ namespace {
     }();
     if (attrs & AttrBuiltin) {
       if (Cfg::Jit::BuiltinsInterceptableByDefault) {
-        return Cfg::Eval::NonInterceptableFunctions.count(fullname) == 0;
+        return true;
       } else {
         return (Cfg::Eval::InterceptableBuiltins.count(fullname) == 1);
       }

hphp/runtime/vm/func-inl.h

@@ -23,10 +23,6 @@
 #include "hphp/util/configs/eval.h"
 
 namespace HPHP {
-
-namespace {
-const StaticString s_TrivialHHVMBuiltinWrapper("TrivialHHVMBuiltinWrapper");
-}
 ///////////////////////////////////////////////////////////////////////////////
 // EH table.
 
@@ -798,41 +794,14 @@ inline bool Func::hasReifiedGenerics() const {
   return shared()->m_allFlags.m_hasReifiedGenerics;
 }
 
-// If the function is a trivial builtin, that is not interceptable, and
-// is persistent, then unwrap it.
-inline Func* Func::unwrap() {
-  if (!RO::EvalReplaceTrivialBuiltins) return this;
-  // Already unwrapped
-  if (RO::RepoAuthoritative) return this;
-  if (RO::funcIsRenamable(name())) return this;
-
-  auto const it = userAttributes().find(s_TrivialHHVMBuiltinWrapper.get());
-  if (it != userAttributes().end()) {
-    assertx(tvIsVec(it->second));
-    auto const args = it->second.m_data.parr;
-    assertx(args->size() == 1);
-    auto const wrappedFunc = args->at(int64_t{0});
-    assertx(tvIsString(wrappedFunc));
-    assertx(wrappedFunc.m_data.pstr->isStatic());
-    auto const resolved_ne = NamedFunc::getOrCreate(wrappedFunc.m_data.pstr);
-    return resolved_ne->func();
-  }
-  return this;
-}
-
 /*
  * Find a function which always uniquely maps to the given name in the context
  * of the given unit. A function so returned can be used directly in the TC as
  * it will not change.
  */
 inline const Func::FuncLookup Func::lookupKnownMaybe(const StringData* name, const Unit* unit) {
-  auto const func = [&]() -> const Func* {
-    auto const ne = NamedFunc::getOrCreate(name);
-    auto const f = ne->func();
-    if (!f) return nullptr;
-    return f->unwrap();
-  }();
-
+  auto const ne = NamedFunc::getOrCreate(name);
+  auto const func = ne->func();
   if (!func || RO::funcIsRenamable(func->name())) return Func::none();
   // In non-repo mode while the function must be available in this unit, it
   // may be de-duplication on load. This may mean that while the func is

hphp/runtime/vm/func.h

@@ -1041,11 +1041,6 @@ struct Func final {
    */
   const ReifiedGenericsInfo& getReifiedGenericsInfo() const;
 
-  /*
-   * Does this function wrap a builtin?
-   */
-  Func* unwrap();
-
   /////////////////////////////////////////////////////////////////////////////
   // Unit table entries.                                                [const]
 

hphp/test/slow/hhbbc/trivial-hhvm-builtin-wrapper.php.expect

@@ -1 +1 @@
-string(3) "bar"
+string(3) "foo"