commit 01694c340db83741cb50e6586f167e3d0d1f55cb
author Richard Smith <richard-llvm@metafoo.co.uk> Sun Mar 20 10:33:40 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sun Mar 20 10:33:40 2016 +0000
tree 7f12f9307bdcb182d096a0ffd6be151db61881e3
parent 25a63b1bccdf0865d609974599d603b782cbaabb

P0184R0: Allow types of 'begin' and 'end' expressions in range-based for loops to differ.

llvm-svn: 263895

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 4d5a772..262c97a 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -3647,7 +3647,10 @@
       return ESR;
 
     // Create the __begin and __end iterators.
-    ESR = EvaluateStmt(Result, Info, FS->getBeginEndStmt());
+    ESR = EvaluateStmt(Result, Info, FS->getBeginStmt());
+    if (ESR != ESR_Succeeded)
+      return ESR;
+    ESR = EvaluateStmt(Result, Info, FS->getEndStmt());
     if (ESR != ESR_Succeeded)
       return ESR;