[llvm-branch-commits] [cfe-branch] r276489 - Merging r276232:

[George Burgess IV via llvm-branch-commits]

Author: gbiv
Date: Fri Jul 22 17:57:21 2016
New Revision: 276489

URL: http://llvm.org/viewvc/llvm-project?rev=276489&view=rev
Log:
Merging r276232:
------------------------------------------------------------------------
r276232 | gbiv | 2016-07-20 20:28:13 -0700 (Wed, 20 Jul 2016) | 13 lines

[Sema] Fix PR28623.

In atomic builtins, we assumed that the LValue conversion on the first
argument would succeed. So, we would crash given code like:

```
void ovl(char);
void ovl(int);
__atomic_store_n(ovl, 0, 0);
```

This patch makes us not assume that said conversion is successful. :)

------------------------------------------------------------------------

Added:
    cfe/branches/release_39/test/SemaCXX/atomic-ops.cpp
Modified:
    cfe/branches/release_39/lib/Sema/SemaChecking.cpp

Modified: cfe/branches/release_39/lib/Sema/SemaChecking.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/lib/Sema/SemaChecking.cpp?rev=276489&r1=276488&r2=276489&view=diff
==============================================================================
--- cfe/branches/release_39/lib/Sema/SemaChecking.cpp (original)
+++ cfe/branches/release_39/lib/Sema/SemaChecking.cpp Fri Jul 22 17:57:21 2016
@@ -2399,7 +2399,11 @@ ExprResult Sema::SemaAtomicOpsOverloaded
 
   // Inspect the first argument of the atomic operation.
   Expr *Ptr = TheCall->getArg(0);
-  Ptr = DefaultFunctionArrayLvalueConversion(Ptr).get();
+  ExprResult ConvertedPtr = DefaultFunctionArrayLvalueConversion(Ptr);
+  if (ConvertedPtr.isInvalid())
+    return ExprError();
+
+  Ptr = ConvertedPtr.get();
   const PointerType *pointerType = Ptr->getType()->getAs<PointerType>();
   if (!pointerType) {
     Diag(DRE->getLocStart(), diag::err_atomic_builtin_must_be_pointer)

Added: cfe/branches/release_39/test/SemaCXX/atomic-ops.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/branches/release_39/test/SemaCXX/atomic-ops.cpp?rev=276489&view=auto
==============================================================================
--- cfe/branches/release_39/test/SemaCXX/atomic-ops.cpp (added)
+++ cfe/branches/release_39/test/SemaCXX/atomic-ops.cpp Fri Jul 22 17:57:21 2016
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 %s -verify -fsyntax-only -triple=i686-linux-gnu -std=c++11
+
+// We crashed when we couldn't properly convert the first arg of __atomic_* to
+// an lvalue.
+void PR28623() {
+  void helper(int); // expected-note{{target}}
+  void helper(char); // expected-note{{target}}
+  __atomic_store_n(helper, 0, 0); // expected-error{{reference to overloaded 
function could not be resolved}}
+}


_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits