Skip to content

Commit

Permalink
Don't burn in request-scoped constants.
Browse files Browse the repository at this point in the history
We burned in STDERR, which changes from request to request. We
also, amazingly, fail to correctly handle the first access to
(some?) system constants in a request when they happen from the JIT.
  • Loading branch information
kma authored and sgolemon committed Aug 2, 2012
1 parent 5586dd1 commit 3d64522
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/runtime/vm/translator/translator-x64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5024,7 +5024,7 @@ TranslatorX64::translateAddNewElemC(const Tracelet& t,
static void undefCns(const StringData* nm) {
EXCEPTION_GATE_ENTER();
VMRegAnchor _;
TypedValue *cns = g_vmContext->getCns(const_cast<StringData*>(nm), false);
TypedValue *cns = g_vmContext->getCns(const_cast<StringData*>(nm));
if (!cns) {
raise_notice(Strings::UNDEFINED_CONSTANT, nm->data(), nm->data());
g_vmContext->getStack().pushStringNoRc(const_cast<StringData*>(nm));
Expand Down Expand Up @@ -5079,7 +5079,7 @@ TranslatorX64::translateCns(const Tracelet& t,
}
}
using namespace TargetCache;
if (tv) {
if (tv && tvIsStatic(tv)) {
m_regMap.allocOutputRegs(i);
if (checkDefined) {
size_t bit = allocCnsBit(name);
Expand Down

0 comments on commit 3d64522

Please sign in to comment.