Drew Paroski
9edc07112b
When object support was first added to HHVM, a class named "Instance" was introduced (deriving from ObjectData) to represent instances of user defined classes. Since then, things have evolved and HPHPc and HPHPi have been retired, and now there really is no needed to have ObjectData and Instance be separate classes anymore. As a first step towards merging ObjectData and Instance together, this diff puts their definitions in the same .h file and puts their implementations in the same .cpp file. A few small changes were necessary to fix issues with cyclical includes: (1) Repo/emitter related parts of class.cpp and class.h were moved to class-emit.cpp and class-emit.h; (2) the contents of "vm/core_types.h" was moved to "base/types.h"; and (3) a few functions that didn't appear to be hot were moved from .h files and the corresponding .cpp files.
98 linhas
3.4 KiB
C++
98 linhas
3.4 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "hphp/runtime/vm/funcdict.h"
|
|
|
|
#include "hphp/runtime/base/runtime_option.h"
|
|
#include "hphp/util/base.h"
|
|
|
|
#include "hphp/runtime/base/execution_context.h"
|
|
#include "hphp/runtime/base/runtime_error.h"
|
|
#include "hphp/runtime/ext_hhvm/ext_hhvm.h"
|
|
#include "hphp/runtime/vm/jit/translator.h"
|
|
#include "hphp/runtime/vm/jit/targetcache.h"
|
|
#include "hphp/runtime/vm/unit.h"
|
|
|
|
#include "hphp/system/systemlib.h"
|
|
|
|
namespace HPHP {
|
|
|
|
RenamedFuncDict::RenamedFuncDict() : m_restrictRenameableFunctions(false) { }
|
|
|
|
bool RenamedFuncDict::rename(const StringData* old, const StringData* n3w) {
|
|
assert(isFunctionRenameable(old) ||
|
|
isFunctionRenameable(n3w));
|
|
|
|
NamedEntity *oldNe = const_cast<NamedEntity *>(Unit::GetNamedEntity(old));
|
|
NamedEntity *newNe = const_cast<NamedEntity *>(Unit::GetNamedEntity(n3w));
|
|
|
|
Func* func = Unit::lookupFunc(oldNe);
|
|
if (!func) {
|
|
// It's the caller's responsibility to ensure that the old function
|
|
// exists.
|
|
not_reached();
|
|
}
|
|
|
|
if (!(func->attrs() & AttrDynamicInvoke)) {
|
|
// When EvalJitEnableRenameFunction is false, the translator may wire
|
|
// non-DynamicInvoke Func*'s into the TC. Don't rename functions.
|
|
if (RuntimeOption::EvalJit && !RuntimeOption::EvalJitEnableRenameFunction) {
|
|
raise_error("You must explicitly enable fb_rename_function in the JIT "
|
|
"(-v Eval.JitEnableRenameFunction=true)");
|
|
}
|
|
}
|
|
|
|
Func *fnew = Unit::lookupFunc(newNe);
|
|
if (fnew && fnew != func) {
|
|
// To match hphpc, we silently ignore functions defined in user code that
|
|
// have the same name as a function defined in a separable extension
|
|
if (!fnew->isAllowOverride()) {
|
|
raise_error("Function already defined: %s", n3w->data());
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
oldNe->setCachedFunc(nullptr);
|
|
if (UNLIKELY(newNe->m_cachedFuncOffset == 0)) {
|
|
Transl::TargetCache::allocFixedFunction(newNe, false);
|
|
}
|
|
newNe->setCachedFunc(func);
|
|
|
|
if (RuntimeOption::EvalJit) {
|
|
Transl::TargetCache::invalidateForRename(old);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool RenamedFuncDict::isFunctionRenameable(const StringData* name) {
|
|
return !m_restrictRenameableFunctions ||
|
|
mapContains(m_renameableFunctions, name);
|
|
}
|
|
|
|
void RenamedFuncDict::addRenameableFunctions(ArrayData* arr) {
|
|
m_restrictRenameableFunctions = true;
|
|
for (ArrayIter iter(arr); iter; ++iter) {
|
|
String name = iter.second().toString();
|
|
if (!name.empty()) {
|
|
m_renameableFunctions.insert(name.get());
|
|
}
|
|
}
|
|
}
|
|
|
|
} // HPHP::VM
|