[PATCH] D146329: [Clang] Fix defaulted equality operator so that it does not attempt to compare unnamed bit-fields

[Shafik Yaghmour via Phabricator via cfe-commits]

shafik updated this revision to Diff 513345.
shafik marked an inline comment as done.
shafik added a comment.

- Update codegen test based on feedback


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D146329/new/

https://reviews.llvm.org/D146329

Files:
  clang/lib/Sema/SemaDeclCXX.cpp
  clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
  clang/test/CodeGenCXX/defaulted_equality_ignore_unnamed_bitfields.cpp


Index: clang/test/CodeGenCXX/defaulted_equality_ignore_unnamed_bitfields.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeGenCXX/defaulted_equality_ignore_unnamed_bitfields.cpp
@@ -0,0 +1,44 @@
+// RUN: %clang_cc1 -std=c++20 %s -triple x86_64-linux -emit-llvm -o - | FileCheck %s
+
+// GH61417
+// Check that we don't attempt to compare the unnamed bitfields
+struct A {
+  unsigned x : 1;
+  unsigned   : 1;
+
+  friend bool operator==(A, A);
+};
+
+
+struct B {
+  unsigned x : 1;
+  unsigned   : 31;
+
+  friend bool operator==(B, B);
+};
+
+bool operator==(A, A) = default;
+// CHECK: define{{.*}} @_Zeq1AS_
+// CHECK: %[[LHS:.+]] = alloca %struct.A, align 4
+// CHECK: %[[RHS:.+]] = alloca %struct.A, align 4
+// CHECK: %[[LHS_LOAD:.+]] = load i8, ptr %[[LHS]], align 4
+// CHECK: %[[LHS_CLEAR:.+]] = and i8 %[[LHS_LOAD]], 1
+// CHECK: %[[LHS_CAST:.+]] = zext i8 %[[LHS_CLEAR]] to i32
+
+// CHECK: %[[RHS_LOAD:.+]] = load i8, ptr %[[RHS]]
+// CHECK: %[[RHS_CLEAR:.+]] = and i8 %[[RHS_LOAD]], 1
+// CHECK: %[[RHS_CAST:.+]] = zext i8 %[[RHS_CLEAR]] to i32
+// CHECK: %[[CMP:.*]] = icmp eq i32 %[[LHS_CAST]], %[[RHS_CAST]]
+// CHECK: ret i1 %[[CMP]]
+
+bool operator==(B, B) = default;
+// CHECK: define{{.*}} @_Zeq1BS_
+// CHECK: %[[LHS_B:.+]] = alloca %struct.B, align 4
+// CHECK: %[[RHS_B:.+]] = alloca %struct.B, align 4
+// CHECK: %[[LHS_LOAD_B:.+]] = load i32, ptr %[[LHS_B]], align 4
+// CHECK: %[[LHS_CLEAR_B:.+]] = and i32 %[[LHS_LOAD_B]], 1
+
+// CHECK: %[[RHS_LOAD_B:.+]] = load i32, ptr %[[RHS_B]]
+// CHECK: %[[RHS_CLEAR_B:.+]] = and i32 %[[RHS_LOAD_B]], 1
+// CHECK: %[[CMP_B:.*]] = icmp eq i32 %[[LHS_CLEAR_B]], %[[RHS_CLEAR_B]]
+// CHECK: ret i1 %[[CMP_B]]
Index: clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
===================================================================
--- clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
+++ clang/test/CXX/class/class.compare/class.compare.default/p1.cpp
@@ -226,3 +226,26 @@
   (void)(b == 0);
 }
 } // namespace p2085_2
+
+namespace GH61417 {
+struct A {
+  unsigned x : 1;
+  unsigned   : 0;
+  unsigned y : 1;
+
+  constexpr A() : x(0), y(0) {}
+  bool operator==(const A& rhs) const noexcept = default;
+};
+
+void f1() {
+  constexpr A a, b;
+  constexpr bool c = (a == b); // no diagnostic, we should not be comparing the
+                               // unnamed bit-field which is indeterminate
+}
+
+void f2() {
+    A a, b;
+    bool c = (a == b); // no diagnostic nor crash during codegen attempting to
+                       // access info for unnamed bit-field
+}
+}
Index: clang/lib/Sema/SemaDeclCXX.cpp
===================================================================
--- clang/lib/Sema/SemaDeclCXX.cpp
+++ clang/lib/Sema/SemaDeclCXX.cpp
@@ -7755,6 +7755,10 @@
 
     //   followed by the non-static data members of C
     for (FieldDecl *Field : Record->fields()) {
+      // C++23 [class.bit]p2:
+      //   Unnamed bit-fields are not members ...
+      if (Field->isUnnamedBitfield())
+        continue;
       // Recursively expand anonymous structs.
       if (Field->isAnonymousStructOrUnion()) {
         if (visitSubobjects(Results, Field->getType()->getAsCXXRecordDecl(),


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D146329.513345.patch
Type: text/x-patch
Size: 3254 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230413/a3d6dbc6/attachment-0001.bin>