diff --git a/hphp/runtime/base/class_info.cpp b/hphp/runtime/base/class_info.cpp index a5d2f8aec..440e3a77d 100644 --- a/hphp/runtime/base/class_info.cpp +++ b/hphp/runtime/base/class_info.cpp @@ -644,26 +644,6 @@ ClassInfoUnique::ClassInfoUnique(const char **&p) { } p++; - if (m_attribute & ClassInfo::UsesTraits) { - while (*p) { - String trait_name = makeStaticString(*p++); - assert(m_traits.find(trait_name) == m_traits.end()); - m_traits.insert(trait_name); - m_traitsVec.push_back(trait_name); - } - p++; - } - - if (m_attribute & ClassInfo::HasAliasedMethods) { - while (*p) { - String new_name = makeStaticString(*p++); - String old_name = makeStaticString(*p++); - m_traitAliasesVec.push_back(std::pair( - new_name, old_name)); - } - p++; - } - while (*p) { MethodInfo *method = new MethodInfo(p); diff --git a/hphp/runtime/base/class_info.h b/hphp/runtime/base/class_info.h index 838ac56f0..4ca875371 100644 --- a/hphp/runtime/base/class_info.h +++ b/hphp/runtime/base/class_info.h @@ -35,7 +35,6 @@ class ClassInfoHook; class ClassInfo { public: enum Attribute { // class prop func method param - IsOverride = (1 << 0), // x IsRedeclared = (1 << 1), // x x IsVolatile = (1 << 2), // x x @@ -60,7 +59,6 @@ public: IsNothing = (1 << 13), HasDocComment = (1 << 14), // x x - IsLazyInit = (1 << 15), // x HasGeneratorAsBody = (1 << 15), // x x HipHopSpecific = (1 << 16), // x x @@ -79,8 +77,6 @@ public: IsSystem = (1 << 28), // x x IsTrait = (1 << 29), // x - UsesTraits = (1 << 30), // x - HasAliasedMethods = (1u << 31),// x NeedsActRec = (1u << 31),// x x };