Pass the right variable table to diagnostics

Author: CodaFi

Sources/FileCheck/CheckString.swift

@@ -80,7 +80,7 @@ struct CheckString {
     // Match itself from the last position after matching CHECK-DAG.
     let matchBuffer = buffer.substring(from: buffer.index(buffer.startIndex, offsetBy: lastPos))
     guard let (range, mutVariableTable) = self.pattern.match(matchBuffer, initialTable) else {
-      diagnoseFailedCheck(variableTable, options, buffer)
+      diagnoseFailedCheck(initialTable, options, buffer)
       return nil
     }
     let (matchPos, matchLen) = (range.location, range.length)
@@ -344,7 +344,7 @@ struct CheckString {
           )
         }
       } else {
-        if let varDef = self.pattern.variableDefs[varName] {
+        if let varDef = variableTable[varName] {
           diagnose(.note,
                    at: self.loc,
                    with: "with variable '\(varName)' equal to '\(varDef)'",

Tests/FileCheckTests/DAGSpec.swift

@@ -15,7 +15,6 @@ class DAGSpec : XCTestCase {
     })
   }
 
-  #if swift(>=4)
   func testDAGWithInst() {
     XCTAssert(fileCheckOutput(of: .stdout, withPrefixes: ["CHECK-INSTDAG"]) {
       // CHECK-INSTDAG-DAG: add [[REG1:r[0-9]+]], r1, r2
@@ -46,6 +45,7 @@ class DAGSpec : XCTestCase {
     })
   }
 
+  #if swift(>=4)
   func testDAGXFailWithInst() {
     XCTAssertFalse(fileCheckOutput(of: .stdout, withPrefixes: ["INSTDAG-XFAIL1"]) {
       // INSTDAG-XFAIL1: __x1