[clang-tools-extra] r176436 - Properly identify 'this' as range-based for container
Edwin Vane
edwin.vane at intel.com
Mon Mar 4 08:35:05 PST 2013
Author: revane
Date: Mon Mar 4 10:35:04 2013
New Revision: 176436
URL: http://llvm.org/viewvc/llvm-project?rev=176436&view=rev
Log:
Properly identify 'this' as range-based for container
The Loop-Convert transform was mistransforming loops using 'this' implicitly.
Fixed and added tests.
Fixes PR15411.
Modified:
clang-tools-extra/trunk/cpp11-migrate/LoopConvert/LoopActions.cpp
clang-tools-extra/trunk/test/cpp11-migrate/LoopConvert/iterator.cpp
Modified: clang-tools-extra/trunk/cpp11-migrate/LoopConvert/LoopActions.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/cpp11-migrate/LoopConvert/LoopActions.cpp?rev=176436&r1=176435&r2=176436&view=diff
==============================================================================
--- clang-tools-extra/trunk/cpp11-migrate/LoopConvert/LoopActions.cpp (original)
+++ clang-tools-extra/trunk/cpp11-migrate/LoopConvert/LoopActions.cpp Mon Mar 4 10:35:04 2013
@@ -871,9 +871,15 @@ StringRef LoopFixer::checkDeferralsAndRe
return "";
}
- StringRef ContainerString =
- getStringFromRange(Context->getSourceManager(), Context->getLangOpts(),
- ContainerExpr->getSourceRange());
+ StringRef ContainerString;
+ if (isa<CXXThisExpr>(ContainerExpr->IgnoreParenImpCasts())) {
+ ContainerString = "this";
+ } else {
+ ContainerString = getStringFromRange(Context->getSourceManager(),
+ Context->getLangOpts(),
+ ContainerExpr->getSourceRange());
+ }
+
// In case someone is using an evil macro, reject this change.
if (ContainerString.empty())
++*RejectedChanges;
Modified: clang-tools-extra/trunk/test/cpp11-migrate/LoopConvert/iterator.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/cpp11-migrate/LoopConvert/iterator.cpp?rev=176436&r1=176435&r2=176436&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/cpp11-migrate/LoopConvert/iterator.cpp (original)
+++ clang-tools-extra/trunk/test/cpp11-migrate/LoopConvert/iterator.cpp Mon Mar 4 10:35:04 2013
@@ -1,6 +1,8 @@
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
// RUN: FileCheck -input-file=%t.cpp %s
+// RUN: cpp11-migrate -loop-convert %t.cpp -risk=risky -- -I %S/Inputs
+// RUN: FileCheck -check-prefix=RISKY -input-file=%t.cpp %s
#include "structures.h"
@@ -99,5 +101,73 @@ void f() {
}
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : intmap)
// CHECK-NEXT: printf("intmap[%d] = %d", [[VAR]].first, [[VAR]].second);
-
}
+
+// Tests to ensure that an implicit 'this' is picked up as the container.
+// If member calls are made to 'this' within the loop, the transform becomes
+// risky as these calls may affect state that affects the loop.
+class C {
+public:
+ typedef MutableVal *iterator;
+ typedef const MutableVal *const_iterator;
+
+ iterator begin();
+ iterator end();
+ const_iterator begin() const;
+ const_iterator end() const;
+
+ void doSomething();
+ void doSomething() const;
+
+ void doLoop() {
+ for (iterator I = begin(), E = end(); I != E; ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ for (iterator I = C::begin(), E = C::end(); I != E; ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ for (iterator I = begin(), E = end(); I != E; ++I) {
+ // CHECK: for (iterator I = begin(), E = end(); I != E; ++I) {
+ // RISKY: for (auto & elem : *this) {
+ doSomething();
+ }
+ for (iterator I = begin(); I != end(); ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ for (iterator I = begin(); I != end(); ++I) {
+ // CHECK: for (iterator I = begin(); I != end(); ++I) {
+ // RISKY: for (auto & elem : *this) {
+ doSomething();
+ }
+ }
+
+ void doLoop() const {
+ for (const_iterator I = begin(), E = end(); I != E; ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ for (const_iterator I = C::begin(), E = C::end(); I != E; ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ for (const_iterator I = begin(), E = end(); I != E; ++I) {
+ // CHECK: for (const_iterator I = begin(), E = end(); I != E; ++I) {
+ // RISKY: for (auto & elem : *this) {
+ doSomething();
+ }
+ }
+};
+
+class C2 {
+public:
+ typedef MutableVal *iterator;
+
+ iterator begin() const;
+ iterator end() const;
+
+ void doLoop() {
+ // The implicit 'this' will have an Implicit cast to const C2* wrapped
+ // around it. Make sure the replacement still happens.
+ for (iterator I = begin(), E = end(); I != E; ++I) {
+ // CHECK: for (auto & elem : *this) {
+ }
+ }
+};
More information about the cfe-commits
mailing list