Merge pull request #29592 from rxwei/TF-1133-windows-fix

compnerd · web-flow · commit 6b8983d83b68 · 2020-02-01T17:02:52.000-08:00
[AutoDiff] Fix windows build failure introduced in #29590.
diff --git a/include/swift/AST/AutoDiff.h b/include/swift/AST/AutoDiff.h
@@ -622,7 +622,7 @@ template <> struct DenseMapInfo<SILAutoDiffDerivativeFunctionKey> {
     return lhs.originalType == rhs.originalType &&
         lhs.parameterIndices == rhs.parameterIndices &&
         lhs.resultIndices == rhs.resultIndices &&
-        lhs.kind == rhs.kind &&
+        lhs.kind.rawValue == rhs.kind.rawValue &&
         lhs.derivativeFnGenSig == rhs.derivativeFnGenSig &&
         lhs.isReabstractionThunk == rhs.isReabstractionThunk;
   }

Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ template <> struct DenseMapInfo<SILAutoDiffDerivativeFunctionKey> {`
`622`	`622`	`return lhs.originalType == rhs.originalType &&`
`623`	`623`	`lhs.parameterIndices == rhs.parameterIndices &&`
`624`	`624`	`lhs.resultIndices == rhs.resultIndices &&`
`625`		`- lhs.kind == rhs.kind &&`
	`625`	`+ lhs.kind.rawValue == rhs.kind.rawValue &&`
`626`	`626`	`lhs.derivativeFnGenSig == rhs.derivativeFnGenSig &&`
`627`	`627`	`lhs.isReabstractionThunk == rhs.isReabstractionThunk;`
`628`	`628`	`}`