From b40bf83eab6049a06159ad69b6422de9d6f3e2ee Mon Sep 17 00:00:00 2001 From: Edwin Vane Date: Thu, 9 May 2013 20:03:52 +0000 Subject: Transform for loops over pseudo-arrays only if begin/end members exist For loops using pseudo-arrays, classes that can be used like arrays from the Loop Convert Transform's point of view, should only get transformed if the pseudo-array class has begin()/end() members for the range-based for-loop to call. Free versions of begin()/end() should also be allowed but this is an enhancement for another revision. llvm-svn: 181539 --- .../test/cpp11-migrate/LoopConvert/pseudoarray.cpp | 41 +++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp') diff --git a/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp b/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp index 37105f9e0b4..5aeaf79fc9f 100644 --- a/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp +++ b/clang-tools-extra/test/cpp11-migrate/LoopConvert/pseudoarray.cpp @@ -1,5 +1,5 @@ // RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp -// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs +// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs -std=c++11 // RUN: FileCheck -input-file=%t.cpp %s #include "structures.h" @@ -64,3 +64,42 @@ void noContainer() { for (auto i = 0; i < v.size(); ++i) ; // CHECK: for (auto & elem : v) ; } + +struct NoBeginEnd { + unsigned size() const; +}; + +struct NoConstBeginEnd { + NoConstBeginEnd(); + unsigned size() const; + unsigned begin(); + unsigned end(); +}; + +struct ConstBeginEnd { + ConstBeginEnd(); + unsigned size() const; + unsigned begin() const; + unsigned end() const; +}; + +// Shouldn't transform pseudo-array uses if the container doesn't provide +// begin() and end() of the right const-ness. +void NoBeginEndTest() { + NoBeginEnd NBE; + for (unsigned i = 0, e = NBE.size(); i < e; ++i) {} + // CHECK: for (unsigned i = 0, e = NBE.size(); i < e; ++i) {} + + const NoConstBeginEnd const_NCBE; + for (unsigned i = 0, e = const_NCBE.size(); i < e; ++i) {} + // CHECK: for (unsigned i = 0, e = const_NCBE.size(); i < e; ++i) {} + + ConstBeginEnd CBE; + for (unsigned i = 0, e = CBE.size(); i < e; ++i) {} + // CHECK: for (auto & elem : CBE) {} + + const ConstBeginEnd const_CBE; + for (unsigned i = 0, e = const_CBE.size(); i < e; ++i) {} + // CHECK: for (auto & elem : const_CBE) {} +} + -- cgit v1.2.3