[llvm-branch-commits] [cfe-branch] r196796 - Merging r196599:
Bill Wendling
isanbard at gmail.com
Mon Dec 9 10:37:20 PST 2013
Author: void
Date: Mon Dec 9 12:37:20 2013
New Revision: 196796
URL: http://llvm.org/viewvc/llvm-project?rev=196796&view=rev
Log:
Merging r196599:
------------------------------------------------------------------------
r196599 | zaks | 2013-12-06 11:28:16 -0800 (Fri, 06 Dec 2013) | 5 lines
Fixup to r196593.
This is another regression fixed by reverting r189090.
In this case, the problem is not live variables but the approach that was taken in r189090. This regression was caused by explicitly binding "true" to the condition when we take the true branch. Normally that's okay, but in this case we're planning to reuse that condition as the value of the expression.
------------------------------------------------------------------------
Modified:
cfe/branches/release_34/ (props changed)
cfe/branches/release_34/test/Analysis/MismatchedDeallocator-checker-test.mm (props changed)
cfe/branches/release_34/test/Analysis/NewDelete-checker-test.cpp (props changed)
cfe/branches/release_34/test/Analysis/malloc.c
cfe/branches/release_34/test/SemaCXX/warn-unreachable.cpp (props changed)
Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 9 12:37:20 2013
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196189-196192,196198-196199,196206,196208-196209,196211,196215,196359-196362,196370,196387,196423,196454,196456,196459,196488,196532-196533,196535,196538,196588,196593,196630,196658,196712,196720,196724
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196189-196192,196198-196199,196206,196208-196209,196211,196215,196359-196362,196370,196387,196423,196454,196456,196459,196488,196532-196533,196535,196538,196588,196593,196599,196630,196658,196712,196720,196724
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Propchange: cfe/branches/release_34/test/Analysis/MismatchedDeallocator-checker-test.mm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 9 12:37:20 2013
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite/test/Analysis/alloc-match-dealloc.mm:134693-134817
-/cfe/trunk/test/Analysis/MismatchedDeallocator-checker-test.mm:195983,196114,196387,196532,196538,196593
+/cfe/trunk/test/Analysis/MismatchedDeallocator-checker-test.mm:195983,196114,196387,196532,196538,196593,196599
/cfe/trunk/test/SemaTemplate/test/Analysis/alloc-match-dealloc.mm:126920
/cfe/trunk/test/test/Analysis/alloc-match-dealloc.mm:170344
Propchange: cfe/branches/release_34/test/Analysis/NewDelete-checker-test.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 9 12:37:20 2013
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite/test/Analysis/NewDelete-checker-test.mm:134693-134817
-/cfe/trunk/test/Analysis/NewDelete-checker-test.cpp:195983,196114,196387,196532,196538,196593
+/cfe/trunk/test/Analysis/NewDelete-checker-test.cpp:195983,196114,196387,196532,196538,196593,196599
/cfe/trunk/test/SemaTemplate/test/Analysis/NewDelete-checker-test.mm:126920
/cfe/trunk/test/test/Analysis/NewDelete-checker-test.mm:170344
Modified: cfe/branches/release_34/test/Analysis/malloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/test/Analysis/malloc.c?rev=196796&r1=196795&r2=196796&view=diff
==============================================================================
--- cfe/branches/release_34/test/Analysis/malloc.c (original)
+++ cfe/branches/release_34/test/Analysis/malloc.c Mon Dec 9 12:37:20 2013
@@ -1290,6 +1290,12 @@ char *dupstrWarn(const char *s) {
return p;
}
+int *radar15580979() {
+ int *data = (int *)malloc(32);
+ int *p = data ?: (int*)malloc(32); // no warning
+ return p;
+}
+
// ----------------------------------------------------------------------------
// False negatives.
Propchange: cfe/branches/release_34/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 9 12:37:20 2013
@@ -1,2 +1,2 @@
/cfe/branches/type-system-rewrite/test/SemaCXX/warn-unreachable.cpp:134693-134817
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,195983,196114,196387,196532,196538,196593
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,195983,196114,196387,196532,196538,196593,196599
More information about the llvm-branch-commits
mailing list