[TCling] Do not add decls for control statements if already annotated

devajithvs · Sep 25, 2024 · 13af1b8 · 13af1b8
1 parent cb520c7
commit 13af1b8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/core/metacling/src/TClingCallbacks.cxx b/core/metacling/src/TClingCallbacks.cxx
@@ -845,6 +845,13 @@ bool TClingCallbacks::tryResolveAtRuntimeInternal(LookupResult &R, Scope *S) {
       return false;
    }
 
+   // FIX-8367
+   // Do not try to resolve if/switch/while/for statement, if already annotated
+   // for(i=0;i<0;); was failing due to multiple addDecls for the same variable.
+   if (auto annot = Wrapper->getAttr<AnnotateAttr>())
+      if (annot->getAnnotation().equals("__ResolveAtRuntime") && S->isControlScope())
+         return false;
+
    VarDecl* Result = VarDecl::Create(C, TU, Loc, Loc, II, C.DependentTy,
                                      /*TypeSourceInfo*/nullptr, SC_None);