Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

class_exist bool autoload should be false if __autoload function doesn't... #959

Closed
wants to merge 1 commit into from
Closed

class_exist bool autoload should be false if __autoload function doesn't... #959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion hphp/runtime/vm/unit.cpp
View file
Open in desktop
Expand Up @@ -53,6 +53,7 @@ TRACE_SET_MOD(hhbc);
static const StaticString s_stdin("STDIN");
static const StaticString s_stdout("STDOUT");
static const StaticString s_stderr("STDERR");
static const StaticString s___autoload("__autoload");

ReadOnlyArena& get_readonly_arena() {
static ReadOnlyArena arena(RuntimeOption::EvalHHBCArenaChunkSize);
Expand Down Expand Up @@ -794,10 +795,10 @@ Class* Unit::getClass(const NamedEntity* ne,
}

bool Unit::classExists(const StringData* name, bool autoload, Attr typeAttrs) {
if(!function_exists(s___autoload)){autoload=false;}
Class* cls = Unit::getClass(name, autoload);
return cls && (cls->attrs() & (AttrInterface | AttrTrait)) == typeAttrs;
}

void Unit::loadFunc(const Func *func) {
assert(!func->isMethod());
const NamedEntity *ne = func->getNamedEntity();
Expand Down