Fix define_class used with local classes.

Closes issue #12.
bloomberg · Mar 17, 2024 · 9e18007 · 9e18007
1 parent 1cefb01
commit 9e18007
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/clang/lib/Sema/Metafunctions.cpp b/clang/lib/Sema/Metafunctions.cpp
@@ -3198,6 +3198,7 @@ bool define_class(APValue &Result, Sema &S, EvalFn Evaluator, QualType ResultTy,
                                       ParsedAttributesView::none());
 
   S.ActOnTagFinishDefinition(&ClsScope, Tag, Args[0]->getSourceRange());
+  S.ActOnPopScope(Range.getEnd(), &ClsScope);
 
   RestoreDC();
   return SetAndSucceed(Result, makeReflection(ToComplete));

diff --git a/libcxx/test/std/experimental/reflection/define-class.pass.cpp b/libcxx/test/std/experimental/reflection/define-class.pass.cpp
@@ -162,6 +162,23 @@ static_assert(nonstatic_data_members_of(^S).size() == 2);
 S s;
 }  // namespace completion_of_dependent_type
 
+                          // =========================
+                          // completion_of_local_class
+                          // =========================
+
+namespace completion_of_local_class {
+consteval int fn() {
+  struct S;
+  static_assert(is_type(define_class(^S, {
+    data_member_spec(^int, {.name="member"})
+  })));
+
+  S s = {13};
+  return s.member;
+}
+static_assert(fn() == 13);
+}  // namespace completion_of_local_class
+
                              // ==================
                              // static_data_member
                              // ==================