[llvm-branch-commits] [cfe-branch] r352132 - Merging r352102:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Jan 24 15:44:31 2019
New Revision: 352132

URL: http://llvm.org/viewvc/llvm-project?rev=352132&view=rev
Log:
Merging r352102:
------------------------------------------------------------------------
r352102 | rsmith | 2019-01-24 21:52:56 +0100 (Thu, 24 Jan 2019) | 2 lines

Add a triple to this test so it passes for targets where alignof(double)
really should be equal to alignof(float).
------------------------------------------------------------------------

Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/test/CXX/dcl.dcl/dcl.attr/dcl.align/p8.cpp

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 24 15:44:31 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351580,352040
+/cfe/trunk:351334,351340,351344,351360,351457,351459,351531,351580,352040,352102
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/test/CXX/dcl.dcl/dcl.attr/dcl.align/p8.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/test/CXX/dcl.dcl/dcl.attr/dcl.align/p8.cpp?rev=352132&r1=352131&r2=352132&view=diff
==============================================================================
--- cfe/branches/release_80/test/CXX/dcl.dcl/dcl.attr/dcl.align/p8.cpp (original)
+++ cfe/branches/release_80/test/CXX/dcl.dcl/dcl.attr/dcl.align/p8.cpp Thu Jan 24 15:44:31 2019
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -std=c++11 -verify %s
+// RUN: %clang_cc1 -std=c++11 -verify %s -triple x86_64-linux-gnu
 
 alignas(double) void f(); // expected-error {{'alignas' attribute only applies to variables, data members and tag types}}
 alignas(double) unsigned char c[sizeof(double)]; // expected-note {{previous}}