[llvm-branch-commits] [cfe-branch] r168823 - in /cfe/branches/release_32: ./ test/Analysis/malloc.c test/SemaObjCXX/pointer-to-objc-pointer-conv.mm

[Pawel Wodnicki]

Author: pawel
Date: Wed Nov 28 16:38:52 2012
New Revision: 168823

URL: http://llvm.org/viewvc/llvm-project?rev=168823&view=rev
Log:
Merging r168303: into the 3.2 release branch.

clang/test: Suppress two tests on LLP64 target, Windows x64.

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/test/Analysis/malloc.c
    cfe/branches/release_32/test/SemaObjCXX/pointer-to-objc-pointer-conv.mm

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 28 16:38:52 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168355,168379,168674
+/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/test/Analysis/malloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/test/Analysis/malloc.c?rev=168823&r1=168822&r2=168823&view=diff
==============================================================================
--- cfe/branches/release_32/test/Analysis/malloc.c (original)
+++ cfe/branches/release_32/test/Analysis/malloc.c Wed Nov 28 16:38:52 2012
@@ -1,4 +1,6 @@
 // RUN: %clang_cc1 -analyze -analyzer-checker=core,alpha.deadcode.UnreachableCode,alpha.core.CastSize,unix.Malloc,debug.ExprInspection -analyzer-store=region -verify %s
+// REQUIRES: LP64
+
 #include "Inputs/system-header-simulator.h"
 
 void clang_analyzer_eval(int);

Modified: cfe/branches/release_32/test/SemaObjCXX/pointer-to-objc-pointer-conv.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/test/SemaObjCXX/pointer-to-objc-pointer-conv.mm?rev=168823&r1=168822&r2=168823&view=diff
==============================================================================
--- cfe/branches/release_32/test/SemaObjCXX/pointer-to-objc-pointer-conv.mm (original)
+++ cfe/branches/release_32/test/SemaObjCXX/pointer-to-objc-pointer-conv.mm Wed Nov 28 16:38:52 2012
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // expected-no-diagnostics
 
+// REQUIRES: LP64
+
 @interface G
 @end