Merge pull request #72 from Dr15Jones/fixBugInLoadingEnums

Fix bug in loading of enums into TClass
cms-sw · Mar 3, 2015 · 709cec3 · 709cec3
2 parents 49c149d + 2eee65d
commit 709cec3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/core/meta/inc/TInterpreter.h b/core/meta/inc/TInterpreter.h
@@ -40,6 +40,7 @@ class TInterpreterValue;
 class TMethod;
 class TObjArray;
 class TEnum;
+class TListOfEnums;
 
 R__EXTERN TVirtualMutex *gInterpreterMutex;
 
@@ -245,7 +246,7 @@ class TInterpreter : public TNamed {
    virtual DeclId_t GetEnum(TClass *cl, const char *name) const = 0;
    virtual TEnum*   CreateEnum(void *VD, TClass *cl) const = 0;
    virtual void     UpdateEnumConstants(TEnum* enumObj, TClass* cl) const = 0;
-   virtual void     LoadEnums(TClass* cl) const = 0;
+   virtual void     LoadEnums(TListOfEnums& cl) const = 0;
    virtual DeclId_t GetFunction(ClassInfo_t *cl, const char *funcname) = 0;
    virtual DeclId_t GetFunctionWithPrototype(ClassInfo_t *cl, const char* method, const char* proto, Bool_t objectIsConst = kFALSE, ROOT::EFunctionMatchMode mode = ROOT::kConversionMatch) = 0;
    virtual DeclId_t GetFunctionWithValues(ClassInfo_t *cl, const char* method, const char* params, Bool_t objectIsConst = kFALSE) = 0;

diff --git a/core/meta/src/TClass.cxx b/core/meta/src/TClass.cxx
@@ -3328,7 +3328,7 @@ TList *TClass::GetListOfEnums(Bool_t load /* = kTRUE */)
    }
 
    if(not load) {
-     if(! ((kIsClass | kIsStruct | kIsUnion) & fProperty) ) {
+      if(! ((kIsClass | kIsStruct | kIsUnion) & Property()) ) {
          R__LOCKGUARD(gInterpreterMutex);
          if(fEnums) {
             return fEnums.load();
@@ -3346,7 +3346,7 @@ TList *TClass::GetListOfEnums(Bool_t load /* = kTRUE */)
    if(fEnums) {
       return fEnums.load();
    }
-   if( (kIsClass | kIsStruct | kIsUnion) & fProperty) {
+   if( (kIsClass | kIsStruct | kIsUnion) & Property()) {
       // For this case, the list will be immutable
       temp = new TListOfEnums(this);
    } else {

diff --git a/core/meta/src/TCling.cxx b/core/meta/src/TCling.cxx
@@ -3167,20 +3167,18 @@ void TCling::CreateListOfBaseClasses(TClass *cl) const
 }
 
 //______________________________________________________________________________
-void TCling::LoadEnums(TClass* cl) const
+void TCling::LoadEnums(TListOfEnums& enumList) const
 {
    // Create list of pointers to enums for TClass cl.
    R__LOCKGUARD2(gInterpreterMutex);
 
    const Decl * D;
-   TListOfEnums* enumList;
+   TClass* cl = enumList.GetClass();
    if (cl) {
       D = ((TClingClassInfo*)cl->GetClassInfo())->GetDecl();
-      enumList = (TListOfEnums*)cl->GetListOfEnums(false);
    }
    else {
       D = fInterpreter->getCI()->getASTContext().getTranslationUnitDecl();
-      enumList = (TListOfEnums*)gROOT->GetListOfEnums();
    }
    // Iterate on the decl of the class and get the enums.
    if (const clang::DeclContext* DC = dyn_cast<clang::DeclContext>(D)) {
@@ -3204,7 +3202,7 @@ void TCling::LoadEnums(TClass* cl) const
                if (!buf.empty()) {
                   const char* name = buf.c_str();
                   // Add the enum to the list of loaded enums.
-                  enumList->Get(ED, name);
+                  enumList.Get(ED, name);
                }
             }
          }

diff --git a/core/meta/src/TCling.h b/core/meta/src/TCling.h
@@ -238,7 +238,7 @@ class TCling : public TInterpreter {
    virtual DeclId_t GetEnum(TClass *cl, const char *name) const;
    virtual TEnum*   CreateEnum(void *VD, TClass *cl) const;
    virtual void     UpdateEnumConstants(TEnum* enumObj, TClass* cl) const;
-   virtual void     LoadEnums(TClass* cl) const;
+   virtual void     LoadEnums(TListOfEnums& cl) const;
    TString GetMangledName(TClass* cl, const char* method, const char* params, Bool_t objectIsConst = kFALSE);
    TString GetMangledNameWithPrototype(TClass* cl, const char* method, const char* proto, Bool_t objectIsConst = kFALSE, ROOT::EFunctionMatchMode mode = ROOT::kConversionMatch);
    void*   GetInterfaceMethod(TClass* cl, const char* method, const char* params, Bool_t objectIsConst = kFALSE);

diff --git a/core/meta/src/TListOfEnums.cxx b/core/meta/src/TListOfEnums.cxx
@@ -357,7 +357,7 @@ void TListOfEnums::Load()
    // We cannot clear the whole unloaded list. It is too much.
 //   fUnloaded->Clear();
 
-   gInterpreter->LoadEnums(fClass);
+   gInterpreter->LoadEnums(*this);
 }
 
 //______________________________________________________________________________