<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<style type="text/css" style="display:none;"><!-- P {margin-top:0;margin-bottom:0;} --></style>
</head>
<body dir="ltr">
<div id="divtagdefaultwrapper" style="font-size:10pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr">
<p style="margin-top:0;margin-bottom:0">Hello!</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<p style="margin-top:0;margin-bottom:0">Did you intend to change the .gitignore here too?</p>
<p style="margin-top:0;margin-bottom:0"><br>
</p>
<p style="margin-top:0;margin-bottom:0">Cheers</p>
<p style="margin-top:0;margin-bottom:0">Dave</p>
</div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> cfe-commits <cfe-commits-bounces@lists.llvm.org> on behalf of Aaron Ballman via cfe-commits <cfe-commits@lists.llvm.org><br>
<b>Sent:</b> 30 November 2018 18:52:51<br>
<b>To:</b> cfe-commits@lists.llvm.org<br>
<b>Subject:</b> r348020 - Reverting r347949-r347951 because they broke the test bots.</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Author: aaronballman<br>
Date: Fri Nov 30 10:52:51 2018<br>
New Revision: 348020<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=348020&view=rev">http://llvm.org/viewvc/llvm-project?rev=348020&view=rev</a><br>
Log:<br>
Reverting r347949-r347951 because they broke the test bots.<br>
<br>
<a href="http://lab.llvm.org:8011/builders/clang-cmake-armv8-lld/builds/440/steps/ninja%20check%202/logs/FAIL%3A%20Clang%3A%3Aosobject-retain-release.cpp">http://lab.llvm.org:8011/builders/clang-cmake-armv8-lld/builds/440/steps/ninja%20check%202/logs/FAIL%3A%20Clang%3A%3Aosobject-retain-release.cpp</a><br>
<br>
Modified:<br>
cfe/trunk/.gitignore<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h<br>
cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp<br>
cfe/trunk/test/Analysis/osobject-retain-release.cpp<br>
cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test<br>
<br>
Modified: cfe/trunk/.gitignore<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/.gitignore?rev=348020&r1=348019&r2=348020&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/.gitignore?rev=348020&r1=348019&r2=348020&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/.gitignore (original)<br>
+++ cfe/trunk/.gitignore Fri Nov 30 10:52:51 2018<br>
@@ -29,8 +29,6 @@ cscope.out<br>
#==============================================================================#<br>
# Directories to ignore (do not add trailing '/'s, they skip symlinks).<br>
#==============================================================================#<br>
-# Clang extra user tools, which is tracked independently (clang-tools-extra).<br>
-tools/extra<br>
# Sphinx build products<br>
docs/_build<br>
docs/analyzer/_build<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h?rev=348020&r1=348019&r2=348020&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h?rev=348020&r1=348019&r2=348020&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/RetainSummaryManager.h Fri Nov 30 10:52:51 2018<br>
@@ -530,8 +530,6 @@ class RetainSummaryManager {<br>
/// Decrement the reference count on OS object.<br>
const RetainSummary *getOSSummaryReleaseRule(const FunctionDecl *FD);<br>
<br>
- /// Free the OS object.<br>
- const RetainSummary *getOSSummaryFreeRule(const FunctionDecl *FD);<br>
<br>
enum UnaryFuncKind { cfretain, cfrelease, cfautorelease, cfmakecollectable };<br>
<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp?rev=348020&r1=348019&r2=348020&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp?rev=348020&r1=348019&r2=348020&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Core/RetainSummaryManager.cpp Fri Nov 30 10:52:51 2018<br>
@@ -124,8 +124,10 @@ RetainSummaryManager::generateSummary(co<br>
}<br>
<br>
const IdentifierInfo *II = FD->getIdentifier();<br>
+ if (!II)<br>
+ return getDefaultSummary();<br>
<br>
- StringRef FName = II ? II->getName() : "";<br>
+ StringRef FName = II->getName();<br>
<br>
// Strip away preceding '_'. Doing this here will effect all the checks<br>
// down below.<br>
@@ -302,12 +304,6 @@ RetainSummaryManager::generateSummary(co<br>
<br>
if (FName == "retain")<br>
return getOSSummaryRetainRule(FD);<br>
-<br>
- if (FName == "free")<br>
- return getOSSummaryFreeRule(FD);<br>
-<br>
- if (MD->getOverloadedOperator() == OO_New)<br>
- return getOSSummaryCreateRule(MD);<br>
}<br>
}<br>
<br>
@@ -495,11 +491,9 @@ RetainSummaryManager::getSummary(const C<br>
case CE_CXXConstructor:<br>
Summ = getFunctionSummary(cast<CXXConstructorCall>(Call).getDecl());<br>
break;<br>
- case CE_CXXAllocator:<br>
- Summ = getFunctionSummary(cast<CXXAllocatorCall>(Call).getDecl());<br>
- break;<br>
case CE_Block:<br>
case CE_CXXDestructor:<br>
+ case CE_CXXAllocator:<br>
// FIXME: These calls are currently unsupported.<br>
return getPersistentStopSummary();<br>
case CE_ObjCMessage: {<br>
@@ -625,14 +619,6 @@ RetainSummaryManager::getOSSummaryReleas<br>
}<br>
<br>
const RetainSummary *<br>
-RetainSummaryManager::getOSSummaryFreeRule(const FunctionDecl *FD) {<br>
- return getPersistentSummary(RetEffect::MakeNoRet(),<br>
- /*ReceiverEff=*/DoNothing,<br>
- /*DefaultEff=*/DoNothing,<br>
- /*ThisEff=*/Dealloc);<br>
-}<br>
-<br>
-const RetainSummary *<br>
RetainSummaryManager::getOSSummaryCreateRule(const FunctionDecl *FD) {<br>
return getPersistentSummary(RetEffect::MakeOwned(RetEffect::OS));<br>
}<br>
<br>
Modified: cfe/trunk/test/Analysis/osobject-retain-release.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/osobject-retain-release.cpp?rev=348020&r1=348019&r2=348020&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/osobject-retain-release.cpp?rev=348020&r1=348019&r2=348020&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Analysis/osobject-retain-release.cpp (original)<br>
+++ cfe/trunk/test/Analysis/osobject-retain-release.cpp Fri Nov 30 10:52:51 2018<br>
@@ -14,7 +14,6 @@ struct OSMetaClass;<br>
struct OSObject {<br>
virtual void retain();<br>
virtual void release() {};<br>
- virtual void free();<br>
virtual ~OSObject(){}<br>
<br>
unsigned int foo() { return 42; }<br>
@@ -24,9 +23,6 @@ struct OSObject {<br>
static OSObject *getObject();<br>
static OSObject *GetObject();<br>
<br>
-<br>
- static void * operator new(unsigned long size);<br>
-<br>
static const OSMetaClass * const metaClass;<br>
};<br>
<br>
@@ -66,34 +62,6 @@ struct OSMetaClassBase {<br>
static OSObject *safeMetaCast(const OSObject *inst, const OSMetaClass *meta);<br>
};<br>
<br>
-void check_free_no_error() {<br>
- OSArray *arr = OSArray::withCapacity(10);<br>
- arr->retain();<br>
- arr->retain();<br>
- arr->retain();<br>
- arr->free();<br>
-}<br>
-<br>
-void check_free_use_after_free() {<br>
- OSArray *arr = OSArray::withCapacity(10); // expected-note{{Call to method 'OSArray::withCapacity' returns an OSObject of type OSArray with a +1 retain count}}<br>
- arr->retain(); // expected-note{{Reference count incremented. The object now has a +2 retain count}}<br>
- arr->free(); // expected-note{{Object released}}<br>
- arr->retain(); // expected-warning{{Reference-counted object is used after it is released}}<br>
- // expected-note@-1{{Reference-counted object is used after it is released}}<br>
-}<br>
-<br>
-unsigned int check_leak_explicit_new() {<br>
- OSArray *arr = new OSArray; // expected-note{{Operator new returns an OSObject of type OSArray with a +1 retain count}}<br>
- return arr->getCount(); // expected-note{{Object leaked: allocated object of type OSArray is not referenced later in this execution path and has a retain count of +1}}<br>
- // expected-warning@-1{{Potential leak of an object of type OSArray}}<br>
-}<br>
-<br>
-unsigned int check_leak_factory() {<br>
- OSArray *arr = OSArray::withCapacity(10); // expected-note{{Call to method 'OSArray::withCapacity' returns an OSObject of type OSArray with a +1 retain count}}<br>
- return arr->getCount(); // expected-note{{Object leaked: object allocated and stored into 'arr' is not referenced later in this execution path and has a retain count of +1}}<br>
- // expected-warning@-1{{Potential leak of an object stored into 'arr'}}<br>
-}<br>
-<br>
void check_get_object() {<br>
OSObject::getObject();<br>
}<br>
<br>
Modified: cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test?rev=348020&r1=348019&r2=348020&view=diff">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test?rev=348020&r1=348019&r2=348020&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test (original)<br>
+++ cfe/trunk/test/Misc/pragma-attribute-supported-attributes-list.test Fri Nov 30 10:52:51 2018<br>
@@ -2,7 +2,7 @@<br>
<br>
// The number of supported attributes should never go down!<br>
<br>
-// CHECK: #pragma clang attribute supports 133 attributes:<br>
+// CHECK: #pragma clang attribute supports 132 attributes:<br>
// CHECK-NEXT: AMDGPUFlatWorkGroupSize (SubjectMatchRule_function)<br>
// CHECK-NEXT: AMDGPUNumSGPR (SubjectMatchRule_function)<br>
// CHECK-NEXT: AMDGPUNumVGPR (SubjectMatchRule_function)<br>
@@ -86,8 +86,8 @@<br>
// CHECK-NEXT: NoThrow (SubjectMatchRule_function)<br>
// CHECK-NEXT: NotTailCalled (SubjectMatchRule_function)<br>
// CHECK-NEXT: OSConsumed (SubjectMatchRule_variable_is_parameter)<br>
-// CHECK-NEXT: OSReturnsNotRetained (SubjectMatchRule_function, SubjectMatchRule_objc_method, SubjectMatchRule_objc_property)<br>
-// CHECK-NEXT: OSReturnsRetained (SubjectMatchRule_function, SubjectMatchRule_objc_method, SubjectMatchRule_objc_property)<br>
+// CHECK-NEXT: OSReturnsNotRetained (SubjectMatchRule_function, SubjectMatchRule_objc_method)<br>
+// CHECK-NEXT: OSReturnsRetained (SubjectMatchRule_function, SubjectMatchRule_objc_method)<br>
// CHECK-NEXT: ObjCBoxable (SubjectMatchRule_record)<br>
// CHECK-NEXT: ObjCBridge (SubjectMatchRule_record, SubjectMatchRule_type_alias)<br>
// CHECK-NEXT: ObjCBridgeMutable (SubjectMatchRule_record)<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
cfe-commits@lists.llvm.org<br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div>
</span></font></div>
</body>
</html>