Rollback useless changes and update comment

Author: actinks

clang/docs/ReleaseNotes.rst

@@ -669,7 +669,7 @@ Bug Fixes in This Version
   base classes. (GH139452)
 - Fixed an assertion failure in serialization of constexpr structs containing unions. (#GH140130)
 - Fixed duplicate entries in TableGen that caused the wrong attribute to be selected. (GH#140701)
-- Fixed type mismatch error caused by const structure pointer dereference when builtins parameter is used. (#GH141397)
+- Fixed type missmach error when 'builtin-elementwise-math' arguments have different qualifiers, this should be a well-formed. (#GH141397)
 
 Bug Fixes to Compiler Builtins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

clang/lib/Sema/SemaChecking.cpp

@@ -2907,7 +2907,7 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID,
       return ExprError();
     }
 
-    if (!Context.hasSameUnqualifiedType(MagnitudeTy, SignTy)) {
+    if (MagnitudeTy.getCanonicalType() != SignTy.getCanonicalType()) {
       return Diag(Sign.get()->getBeginLoc(),
                   diag::err_typecheck_call_different_arg_types)
              << MagnitudeTy << SignTy;
@@ -5265,7 +5265,7 @@ bool Sema::BuiltinComplex(CallExpr *TheCall) {
 
   Expr *Real = TheCall->getArg(0);
   Expr *Imag = TheCall->getArg(1);
-  if (!Context.hasSameUnqualifiedType(Real->getType(), Imag->getType())) {
+  if (!Context.hasSameType(Real->getType(), Imag->getType())) {
     return Diag(Real->getBeginLoc(),
                 diag::err_typecheck_call_different_arg_types)
            << Real->getType() << Imag->getType()
@@ -15607,8 +15607,8 @@ bool Sema::BuiltinElementwiseTernaryMath(
   }
 
   for (int I = 1; I < 3; ++I) {
-    if (!Context.hasSameUnqualifiedType(Args[0]->getType(),
-                                        Args[I]->getType())) {
+    if (Args[0]->getType().getCanonicalType() !=
+        Args[I]->getType().getCanonicalType()) {
       return Diag(Args[0]->getBeginLoc(),
                   diag::err_typecheck_call_different_arg_types)
              << Args[0]->getType() << Args[I]->getType();

clang/test/Sema/builtins-elementwise-math.c

@@ -1207,7 +1207,8 @@ void test_builtin_elementwise_fma(int i32, int2 v2i32, short i16,
 typedef struct {
   float3 b;
 } struct_float3;
-// This example uncovered a bug #141397
+// This example uncovered a bug #141397 :
+// Type missmach error when 'builtin-elementwise-math' arguments have different qualifiers, this should be a well-formed
 float3 foo(float3 a,const struct_float3* hi) {
   float3 b = __builtin_elementwise_max((float3)(0.0f), a);
   return __builtin_elementwise_pow(b, hi->b.yyy);