[clang] [Clang][Sema] Correctly transform dependent operands of overloaded binary operator& (PR #97596)

[via cfe-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Krystian Stasiowski (sdkrystian)

<details>
<summary>Changes</summary>

Currently, `TreeTransform::TransformCXXOperatorCallExpr` calls 
`TreeTransform::TransformAddressOfOperand` to transform the first operand of a 
`CXXOperatorCallExpr` when its `OverloadOperatorKind` is `OO_Amp` -- regardless 
of arity. This results in the first operand of binary `operator&amp;` being 
incorrectly transformed as if it was the operand of the address of operator in 
cases such as the following:
```cpp
struct A {
  int x;
};

void operator&amp;(A, A);

template&lt;typename T&gt;
struct B {
  int f() {
    return T::x &amp; 1; // invalid reference to 'A::x' is not diagnosed 
because 'T::x' is incorrectly transformed as if it was the operand of unary 
operator&amp;
  }
};

template struct B&lt;A&gt;;
```
Prior to #<!-- -->92318 we would build a `CXXDependentScopeMemberExpr` for 
`T::x` (as with most dependent qualified names that were not member qualified 
names). Since `TreeTransform::TransformAddressOfOperand` only differs from 
`TransformExpr` for `DependentScopeDeclRefExpr` and `UnresolvedLookupExpr` 
operands, `T::x` was transformed "correctly". Now that we build a 
`DependentScopeDeclRefExpr` for `T::x`, it is incorrectly transformed as if it 
was the operand of the address of operator and we fail to diagnose the invalid 
reference to a non-static data member. This patch fixes the issue by only 
calling `TreeTransform::TransformAddressOfOperand` for `CXXOperatorCallExpr`s 
with a single operand. This fixes #<!-- -->97483. 


---
Full diff: https://github.com/llvm/llvm-project/pull/97596.diff


2 Files Affected:

- (modified) clang/lib/Sema/TreeTransform.h (+1-1) 
- (added) 
clang/test/CXX/expr/expr.prim/expr.prim.id/expr.prim.id.general/p4.cpp (+16) 


``````````diff
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 51ba22f99e3a3..4450ebaf615cd 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -12919,7 +12919,7 @@ 
TreeTransform<Derived>::TransformCXXOperatorCallExpr(CXXOperatorCallExpr *E) {
   }
 
   ExprResult First;
-  if (E->getOperator() == OO_Amp)
+  if (E->getNumArgs() == 1 && E->getOperator() == OO_Amp)
     First = getDerived().TransformAddressOfOperand(E->getArg(0));
   else
     First = getDerived().TransformExpr(E->getArg(0));
diff --git 
a/clang/test/CXX/expr/expr.prim/expr.prim.id/expr.prim.id.general/p4.cpp 
b/clang/test/CXX/expr/expr.prim/expr.prim.id/expr.prim.id.general/p4.cpp
new file mode 100644
index 0000000000000..e6d9c171e3893
--- /dev/null
+++ b/clang/test/CXX/expr/expr.prim/expr.prim.id/expr.prim.id.general/p4.cpp
@@ -0,0 +1,16 @@
+// RUN: %clang_cc1 -verify %s
+
+struct A {
+  int x;
+};
+
+void operator&(A, A);
+
+template<typename T>
+struct B {
+  int f() {
+    return T::x & 1; // expected-error {{invalid use of non-static data member 
'x'}}
+  }
+};
+
+template struct B<A>; // expected-note {{in instantiation of}}

``````````

</details>


https://github.com/llvm/llvm-project/pull/97596
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits