[llvm] r368436 - [MCA] Fix MSVC 19.16 build with libc++

Andrea Di Biagio via llvm-commits llvm-commits at lists.llvm.org
Fri Aug 9 05:41:24 PDT 2019


Author: adibiagio
Date: Fri Aug  9 05:41:24 2019
New Revision: 368436

URL: http://llvm.org/viewvc/llvm-project?rev=368436&view=rev
Log:
[MCA] Fix MSVC 19.16 build with libc++

MSVC (19.16) wants to see the definition of Instruction in
`std::pair<unsigned, const Instruction &> SourceRef` to decide
if it is assignable.

Patch by Orivej Desh.

Differential Revision: https://reviews.llvm.org/D65844

Modified:
    llvm/trunk/include/llvm/MCA/SourceMgr.h

Modified: llvm/trunk/include/llvm/MCA/SourceMgr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MCA/SourceMgr.h?rev=368436&r1=368435&r2=368436&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MCA/SourceMgr.h (original)
+++ llvm/trunk/include/llvm/MCA/SourceMgr.h Fri Aug  9 05:41:24 2019
@@ -16,12 +16,13 @@
 #define LLVM_MCA_SOURCEMGR_H
 
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/MCA/Instruction.h"
 
 namespace llvm {
 namespace mca {
 
-class Instruction;
-
+// MSVC >= 19.15, < 19.20 need to see the definition of class Instruction to
+// prevent compiler error C2139 about intrinsic type trait '__is_assignable'.
 typedef std::pair<unsigned, const Instruction &> SourceRef;
 
 class SourceMgr {




More information about the llvm-commits mailing list