[llvm-branch-commits] [cfe-branch] r155376 - in /cfe/branches/release_31: ./ test/CodeGen/arm-homogenous.c test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Apr 23 13:33:49 2012
New Revision: 155376

URL: http://llvm.org/viewvc/llvm-project?rev=155376&view=rev
Log:
Merging r155342:
------------------------------------------------------------------------
r155342 | asl | 2012-04-23 02:02:13 -0700 (Mon, 23 Apr 2012) | 3 lines

Do not use stdint.h, driver might provide invalid location for it. Instead, provide the types directly.
This should fix PR12628

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

Modified:
    cfe/branches/release_31/   (props changed)
    cfe/branches/release_31/test/CodeGen/arm-homogenous.c
    cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 13:33:49 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:155076,155279
+/cfe/trunk:155076,155279,155342
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_31/test/CodeGen/arm-homogenous.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/test/CodeGen/arm-homogenous.c?rev=155376&r1=155375&r2=155376&view=diff
==============================================================================
--- cfe/branches/release_31/test/CodeGen/arm-homogenous.c (original)
+++ cfe/branches/release_31/test/CodeGen/arm-homogenous.c Mon Apr 23 13:33:49 2012
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple armv7---eabi -target-abi aapcs -mfloat-abi hard -emit-llvm %s -o - | FileCheck %s
-#include <stdint.h>
+
+typedef long long int64_t;
+typedef unsigned int uint32_t;
 
 /* This is not a homogenous aggregate - fundamental types are different */
 typedef union {

Propchange: cfe/branches/release_31/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 13:33:49 2012
@@ -1,2 +1,2 @@
 /cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,155076,155279,155342