Merge commit 'a6516a820d35' from llvm.org/master into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit 4ade7798bb1d · 2020-12-19T10:57:35.000-08:00
diff --git a/llvm/lib/Analysis/MemDepPrinter.cpp b/llvm/lib/Analysis/MemDepPrinter.cpp
@@ -72,9 +72,6 @@ namespace {
       assert(dep.isUnknown() && "unexpected dependence type");
       return InstTypePair(dep.getInst(), Unknown);
     }
-    static InstTypePair getInstTypePair(const Instruction* inst, DepType type) {
-      return InstTypePair(inst, type);
-    }
   };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,6 @@ namespace {`
`72`	`72`	`assert(dep.isUnknown() && "unexpected dependence type");`
`73`	`73`	`return InstTypePair(dep.getInst(), Unknown);`
`74`	`74`	`}`
`75`		`- static InstTypePair getInstTypePair(const Instruction* inst, DepType type) {`
`76`		`- return InstTypePair(inst, type);`
`77`		`- }`
`78`	`75`	`};`
`79`	`76`	`}`
`80`	`77`