Instrument: fix the handling of C++ for-range loops

Change-Id: If2f61279b6ddee174354b30cc9a0636b4a8cb63b
TN: V816-018

Author: pmderodat

tools/gnatcov/clang-extensions.ads

@@ -45,6 +45,9 @@ package Clang.Extensions is
    function Get_Var_Init_Expr (C : Cursor_T) return Cursor_T
      with Import, Convention => C, External_Name => "clang_getVarInitExpr";
 
+   function Get_For_Range_Expr (C : Cursor_T) return Cursor_T
+     with Import, Convention => C, External_Name => "clang_getForRangeExpr";
+
    function Get_Then (C : Cursor_T) return Cursor_T
      with Import, Convention => C, External_Name => "clang_getThen";
 

tools/gnatcov/clang-wrapper.cc

@@ -169,12 +169,31 @@ clang_getForInit (CXCursor C)
         {
         case Stmt::ForStmtClass:
           return MakeCXCursorWithNull (cast<ForStmt> (S)->getInit (), C);
+        case Stmt::CXXForRangeStmtClass:
+          return MakeCXCursorWithNull (cast<CXXForRangeStmt> (S)->getInit (),
+                                       C);
         default:
           return clang_getNullCursor ();
         }
   return clang_getNullCursor ();
 }
 
+extern "C" CXCursor
+clang_getForRangeExpr (CXCursor C)
+{
+  const Stmt *stmt;
+  const CXXForRangeStmt *for_stmt;
+
+  if (clang_isStatement (C.kind)
+      && (stmt = cxcursor::getCursorStmt (C))
+      && stmt->getStmtClass () == Stmt::CXXForRangeStmtClass)
+    {
+      for_stmt = cast<CXXForRangeStmt> (stmt);
+      return MakeCXCursorWithNull (for_stmt->getRangeInit (), C);
+    }
+  return clang_getNullCursor ();
+}
+
 extern "C" CXCursor
 clang_getForInc (CXCursor C)
 {

tools/gnatcov/instrument-c.adb

@@ -1999,9 +1999,28 @@ package body Instrument.C is
 
             when Cursor_CXX_For_Range_Stmt =>
                declare
-                  For_Body : constant Cursor_T := Get_Body (N);
+                  For_Init_Stmt  : constant Cursor_T := Get_For_Init (N);
+                  For_Range_Decl : constant Cursor_T := Get_For_Range_Expr (N);
+                  For_Body       : constant Cursor_T := Get_Body (N);
                begin
+                  --  Generate SCO statements for both the init statement and
+                  --  the range declaration initialization expression. Like all
+                  --  statements, they can contain nested decisions.
+
+                  Extend_Statement_Sequence
+                    (For_Init_Stmt, ' ', Insertion_N => N);
+                  Process_Decisions_Defer (For_Init_Stmt, 'X');
+
+                  Extend_Statement_Sequence
+                    (For_Range_Decl, ' ',
+                     Insertion_N  => For_Range_Decl,
+                     Instr_Scheme => Instr_Expr);
+                  Process_Decisions_Defer (For_Range_Decl, 'X');
+
                   Set_Statement_Entry;
+
+                  --  Generate obligations for body statements
+
                   UIC.Pass.Curlify (N => For_Body, Rew => UIC.Rewriter);
                   Traverse_Statements
                     (IC, UIC,