[llvm-branch-commits] [cfe-branch] r182037 - Merging r181465:

[Bill Wendling]

Author: void
Date: Thu May 16 13:43:39 2013
New Revision: 182037

URL: http://llvm.org/viewvc/llvm-project?rev=182037&view=rev
Log:
Merging r181465:
------------------------------------------------------------------------
r181465 | rsmith | 2013-05-08 13:32:14 -0700 (Wed, 08 May 2013) | 2 lines

Add missing triple to unit test.

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

Modified:
    cfe/branches/release_33/   (props changed)
    cfe/branches/release_33/test/CodeGenCXX/throw-expressions.cpp

Propchange: cfe/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 16 13:43:39 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:181286,181299,181368,181728,181750,181909
+/cfe/trunk:181286,181299,181368,181465,181728,181750,181909
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_33/test/CodeGenCXX/throw-expressions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_33/test/CodeGenCXX/throw-expressions.cpp?rev=182037&r1=182036&r2=182037&view=diff
==============================================================================
--- cfe/branches/release_33/test/CodeGenCXX/throw-expressions.cpp (original)
+++ cfe/branches/release_33/test/CodeGenCXX/throw-expressions.cpp Thu May 16 13:43:39 2013
@@ -1,5 +1,4 @@
-// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -Wno-unreachable-code -Werror -emit-llvm -o - %s | FileCheck %s
-// expected-no-diagnostics
+// RUN: %clang_cc1 -fcxx-exceptions -fexceptions -Wno-unreachable-code -Werror -triple x86_64-linux-gnu -emit-llvm -o - %s | FileCheck %s
 
 int val = 42;
 int& test1() {