jdoerfert updated this revision to Diff 368943.
jdoerfert added a comment.
Clang format patch
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D108774/new/
https://reviews.llvm.org/D108774
Files:
clang/lib/AST/ASTContext.cpp
clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp
Index: clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp
===================================================================
--- /dev/null
+++ clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp
@@ -0,0 +1,148 @@
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fopenmp -verify -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fopenmp -verify -ast-dump %s -x c++| FileCheck %s
+// expected-no-diagnostics
+
+int Good, Bad;
+int &also_before() {
+ return Bad;
+}
+
+#pragma omp begin declare variant match(implementation = {vendor(score(100) \
+ : llvm)})
+int also_after(void) {
+ return 2;
+}
+int also_after(int &) {
+ return 3;
+}
+int also_after(double &) {
+ return 0;
+}
+#pragma omp end declare variant
+#pragma omp begin declare variant match(implementation = {vendor(score(0) \
+ : llvm)})
+int &also_before() {
+ return Good;
+}
+#pragma omp end declare variant
+
+int also_after(void) {
+ return 4;
+}
+int also_after(int) {
+ return 5;
+}
+int also_after(double &) {
+ return 6;
+}
+
+int test1() {
+ // Should return 0.
+ double d;
+ return also_after(d);
+}
+
+int test2() {
+ // Should return 0.
+ return &also_before() == &Good;
+}
+
+int test() {
+ // Should return 0.
+ return test1() + test2();
+}
+
+// CHECK: |-VarDecl [[ADDR_0:0x[a-z0-9]*]] <{{.*}}, col:5> col:5 used Good 'int'
+// CHECK-NEXT: |-VarDecl [[ADDR_1:0x[a-z0-9]*]] <col:1, col:11> col:11 used Bad 'int'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_2:0x[a-z0-9]*]] <line:6:1, line:8:1> line:6:6 used also_before 'int &({{.*}})'
+// CHECK-NEXT: | |-CompoundStmt [[ADDR_3:0x[a-z0-9]*]] <col:20, line:8:1>
+// CHECK-NEXT: | | `-ReturnStmt [[ADDR_4:0x[a-z0-9]*]] <line:7:3, col:10>
+// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_5:0x[a-z0-9]*]] <col:10> 'int' {{.*}}Var [[ADDR_1]] 'Bad' 'int'
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_6:0x[a-z0-9]*]] <<invalid sloc>> Implicit implementation={vendor(score(0): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_7:0x[a-z0-9]*]] <line:22:1> 'int &({{.*}})' {{.*}}Function [[ADDR_8:0x[a-z0-9]*]] 'also_before[implementation={vendor(llvm)}]' 'int &({{.*}})'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_9:0x[a-z0-9]*]] <line:11:1, col:20> col:5 implicit also_after 'int ({{.*}})'
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_10:0x[a-z0-9]*]] <<invalid sloc>> Implicit implementation={vendor(score(100): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_11:0x[a-z0-9]*]] <col:1> 'int ({{.*}})' {{.*}}Function [[ADDR_12:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int ({{.*}})'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_12]] <col:1, line:13:1> line:11:1 also_after[implementation={vendor(llvm)}] 'int ({{.*}})'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_13:0x[a-z0-9]*]] <col:22, line:13:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_14:0x[a-z0-9]*]] <line:12:3, col:10>
+// CHECK-NEXT: | `-IntegerLiteral [[ADDR_15:0x[a-z0-9]*]] <col:10> 'int' 2
+// CHECK-NEXT: |-FunctionDecl [[ADDR_16:0x[a-z0-9]*]] <line:14:1, col:20> col:5 implicit also_after 'int (int &)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_17:0x[a-z0-9]*]] <col:16, col:19> col:20 'int &'
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_18:0x[a-z0-9]*]] <<invalid sloc>> Implicit implementation={vendor(score(100): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_19:0x[a-z0-9]*]] <col:1> 'int (int &)' {{.*}}Function [[ADDR_20:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int (int &)'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_20]] <col:1, line:16:1> line:14:1 also_after[implementation={vendor(llvm)}] 'int (int &)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_17]] <col:16, col:19> col:20 'int &'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_21:0x[a-z0-9]*]] <col:22, line:16:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_22:0x[a-z0-9]*]] <line:15:3, col:10>
+// CHECK-NEXT: | `-IntegerLiteral [[ADDR_23:0x[a-z0-9]*]] <col:10> 'int' 3
+// CHECK-NEXT: |-FunctionDecl [[ADDR_24:0x[a-z0-9]*]] <line:17:1, col:23> col:5 implicit used also_after 'int (double &)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_25:0x[a-z0-9]*]] <col:16, col:22> col:23 'double &'
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_26:0x[a-z0-9]*]] <<invalid sloc>> Implicit implementation={vendor(score(100): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_27:0x[a-z0-9]*]] <col:1> 'int (double &)' {{.*}}Function [[ADDR_28:0x[a-z0-9]*]] 'also_after[implementation={vendor(llvm)}]' 'int (double &)'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_28]] <col:1, line:19:1> line:17:1 also_after[implementation={vendor(llvm)}] 'int (double &)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_25]] <col:16, col:22> col:23 'double &'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_29:0x[a-z0-9]*]] <col:25, line:19:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_30:0x[a-z0-9]*]] <line:18:3, col:10>
+// CHECK-NEXT: | `-IntegerLiteral [[ADDR_31:0x[a-z0-9]*]] <col:10> 'int' 0
+// CHECK-NEXT: |-FunctionDecl [[ADDR_8]] <line:22:1, line:24:1> line:22:1 also_before[implementation={vendor(llvm)}] 'int &({{.*}})'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_32:0x[a-z0-9]*]] <col:20, line:24:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_33:0x[a-z0-9]*]] <line:23:3, col:10>
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_34:0x[a-z0-9]*]] <col:10> 'int' {{.*}}Var [[ADDR_0]] 'Good' 'int'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_35:0x[a-z0-9]*]] prev [[ADDR_9]] <line:27:1, line:29:1> line:27:5 also_after 'int ({{.*}})'
+// CHECK-NEXT: | |-CompoundStmt [[ADDR_36:0x[a-z0-9]*]] <col:22, line:29:1>
+// CHECK-NEXT: | | `-ReturnStmt [[ADDR_37:0x[a-z0-9]*]] <line:28:3, col:10>
+// CHECK-NEXT: | | `-IntegerLiteral [[ADDR_38:0x[a-z0-9]*]] <col:10> 'int' 4
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_39:0x[a-z0-9]*]] <<invalid sloc>> Inherited Implicit implementation={vendor(score(100): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_11]] <line:11:1> 'int ({{.*}})' {{.*}}Function [[ADDR_12]] 'also_after[implementation={vendor(llvm)}]' 'int ({{.*}})'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_40:0x[a-z0-9]*]] <line:30:1, line:32:1> line:30:5 also_after 'int (int)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_41:0x[a-z0-9]*]] <col:16> col:19 'int'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_42:0x[a-z0-9]*]] <col:21, line:32:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_43:0x[a-z0-9]*]] <line:31:3, col:10>
+// CHECK-NEXT: | `-IntegerLiteral [[ADDR_44:0x[a-z0-9]*]] <col:10> 'int' 5
+// CHECK-NEXT: |-FunctionDecl [[ADDR_45:0x[a-z0-9]*]] prev [[ADDR_24]] <line:33:1, line:35:1> line:33:5 used also_after 'int (double &)'
+// CHECK-NEXT: | |-ParmVarDecl [[ADDR_46:0x[a-z0-9]*]] <col:16, col:22> col:23 'double &'
+// CHECK-NEXT: | |-CompoundStmt [[ADDR_47:0x[a-z0-9]*]] <col:25, line:35:1>
+// CHECK-NEXT: | | `-ReturnStmt [[ADDR_48:0x[a-z0-9]*]] <line:34:3, col:10>
+// CHECK-NEXT: | | `-IntegerLiteral [[ADDR_49:0x[a-z0-9]*]] <col:10> 'int' 6
+// CHECK-NEXT: | `-OMPDeclareVariantAttr [[ADDR_50:0x[a-z0-9]*]] <<invalid sloc>> Inherited Implicit implementation={vendor(score(100): llvm)}
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_27]] <line:17:1> 'int (double &)' {{.*}}Function [[ADDR_28]] 'also_after[implementation={vendor(llvm)}]' 'int (double &)'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_51:0x[a-z0-9]*]] <line:37:1, line:41:1> line:37:5 used test1 'int ({{.*}})'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_52:0x[a-z0-9]*]] <col:13, line:41:1>
+// CHECK-NEXT: | |-DeclStmt [[ADDR_53:0x[a-z0-9]*]] <line:39:3, col:11>
+// CHECK-NEXT: | | `-VarDecl [[ADDR_54:0x[a-z0-9]*]] <col:3, col:10> col:10 used d 'double'
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_55:0x[a-z0-9]*]] <line:40:3, col:22>
+// CHECK-NEXT: | `-PseudoObjectExpr [[ADDR_56:0x[a-z0-9]*]] <col:10, col:22> 'int'
+// CHECK-NEXT: | |-CallExpr [[ADDR_57:0x[a-z0-9]*]] <col:10, col:22> 'int'
+// CHECK-NEXT: | | |-ImplicitCastExpr [[ADDR_58:0x[a-z0-9]*]] <col:10> 'int (*)(double &)' <FunctionToPointerDecay>
+// CHECK-NEXT: | | | `-DeclRefExpr [[ADDR_59:0x[a-z0-9]*]] <col:10> 'int (double &)' {{.*}}Function [[ADDR_45]] 'also_after' 'int (double &)'
+// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_60:0x[a-z0-9]*]] <col:21> 'double' {{.*}}Var [[ADDR_54]] 'd' 'double'
+// CHECK-NEXT: | `-CallExpr [[ADDR_61:0x[a-z0-9]*]] <line:17:1, line:40:22> 'int'
+// CHECK-NEXT: | |-ImplicitCastExpr [[ADDR_62:0x[a-z0-9]*]] <line:17:1> 'int (*)(double &)' <FunctionToPointerDecay>
+// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_27]] <col:1> 'int (double &)' {{.*}}Function [[ADDR_28]] 'also_after[implementation={vendor(llvm)}]' 'int (double &)'
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_60]] <line:40:21> 'double' {{.*}}Var [[ADDR_54]] 'd' 'double'
+// CHECK-NEXT: |-FunctionDecl [[ADDR_63:0x[a-z0-9]*]] <line:43:1, line:46:1> line:43:5 used test2 'int ({{.*}})'
+// CHECK-NEXT: | `-CompoundStmt [[ADDR_64:0x[a-z0-9]*]] <col:13, line:46:1>
+// CHECK-NEXT: | `-ReturnStmt [[ADDR_65:0x[a-z0-9]*]] <line:45:3, col:29>
+// CHECK-NEXT: | `-ImplicitCastExpr [[ADDR_66:0x[a-z0-9]*]] <col:10, col:29> 'int' <IntegralCast>
+// CHECK-NEXT: | `-BinaryOperator [[ADDR_67:0x[a-z0-9]*]] <col:10, col:29> 'bool' '=='
+// CHECK-NEXT: | |-UnaryOperator [[ADDR_68:0x[a-z0-9]*]] <col:10, col:23> 'int *' prefix '&' cannot overflow
+// CHECK-NEXT: | | `-PseudoObjectExpr [[ADDR_69:0x[a-z0-9]*]] <col:11, col:23> 'int' lvalue
+// CHECK-NEXT: | | |-CallExpr [[ADDR_70:0x[a-z0-9]*]] <col:11, col:23> 'int' lvalue
+// CHECK-NEXT: | | | `-ImplicitCastExpr [[ADDR_71:0x[a-z0-9]*]] <col:11> 'int &(*)({{.*}})' <FunctionToPointerDecay>
+// CHECK-NEXT: | | | `-DeclRefExpr [[ADDR_72:0x[a-z0-9]*]] <col:11> 'int &({{.*}})' {{.*}}Function [[ADDR_2]] 'also_before' 'int &({{.*}})'
+// CHECK-NEXT: | | `-CallExpr [[ADDR_73:0x[a-z0-9]*]] <line:22:1, line:45:23> 'int' lvalue
+// CHECK-NEXT: | | `-ImplicitCastExpr [[ADDR_74:0x[a-z0-9]*]] <line:22:1> 'int &(*)({{.*}})' <FunctionToPointerDecay>
+// CHECK-NEXT: | | `-DeclRefExpr [[ADDR_7]] <col:1> 'int &({{.*}})' {{.*}}Function [[ADDR_8]] 'also_before[implementation={vendor(llvm)}]' 'int &({{.*}})'
+// CHECK-NEXT: | `-UnaryOperator [[ADDR_75:0x[a-z0-9]*]] <line:45:28, col:29> 'int *' prefix '&' cannot overflow
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_76:0x[a-z0-9]*]] <col:29> 'int' {{.*}}Var [[ADDR_0]] 'Good' 'int'
+// CHECK-NEXT: `-FunctionDecl [[ADDR_77:0x[a-z0-9]*]] <line:48:1, line:51:1> line:48:5 test 'int ({{.*}})'
+// CHECK-NEXT: `-CompoundStmt [[ADDR_78:0x[a-z0-9]*]] <col:12, line:51:1>
+// CHECK-NEXT: `-ReturnStmt [[ADDR_79:0x[a-z0-9]*]] <line:50:3, col:26>
+// CHECK-NEXT: `-BinaryOperator [[ADDR_80:0x[a-z0-9]*]] <col:10, col:26> 'int' '+'
+// CHECK-NEXT: |-CallExpr [[ADDR_81:0x[a-z0-9]*]] <col:10, col:16> 'int'
+// CHECK-NEXT: | `-ImplicitCastExpr [[ADDR_82:0x[a-z0-9]*]] <col:10> 'int (*)({{.*}})' <FunctionToPointerDecay>
+// CHECK-NEXT: | `-DeclRefExpr [[ADDR_83:0x[a-z0-9]*]] <col:10> 'int ({{.*}})' {{.*}}Function [[ADDR_51]] 'test1' 'int ({{.*}})'
+// CHECK-NEXT: `-CallExpr [[ADDR_84:0x[a-z0-9]*]] <col:20, col:26> 'int'
+// CHECK-NEXT: `-ImplicitCastExpr [[ADDR_85:0x[a-z0-9]*]] <col:20> 'int (*)({{.*}})' <FunctionToPointerDecay>
+// CHECK-NEXT: `-DeclRefExpr [[ADDR_86:0x[a-z0-9]*]] <col:20> 'int ({{.*}})' {{.*}}Function [[ADDR_63]] 'test2' 'int ({{.*}})'
Index: clang/lib/AST/ASTContext.cpp
===================================================================
--- clang/lib/AST/ASTContext.cpp
+++ clang/lib/AST/ASTContext.cpp
@@ -9680,11 +9680,18 @@
QualType ASTContext::mergeTypes(QualType LHS, QualType RHS,
bool OfBlockPointer,
bool Unqualified, bool BlockReturnType) {
+ // For C++ we will not reach this code with reference types (see below),
+ // for OpenMP variant call overloading we might.
+ //
// C++ [expr]: If an expression initially has the type "reference to T", the
// type is adjusted to "T" prior to any further analysis, the expression
// designates the object or function denoted by the reference, and the
// expression is an lvalue unless the reference is an rvalue reference and
// the expression is a function call (possibly inside parentheses).
+ if (LHS->getAs<ReferenceType>() && RHS->getAs<ReferenceType>())
+ return mergeTypes(LHS->getAs<ReferenceType>()->getPointeeType(),
+ RHS->getAs<ReferenceType>()->getPointeeType(),
+ OfBlockPointer, Unqualified, BlockReturnType);
if (LHS->getAs<ReferenceType>() || RHS->getAs<ReferenceType>())
return {};
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
