From a874d1a40d2410f3e0d5f28a47c1217c02770cb0 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Sat, 26 Mar 2016 18:20:02 +0000 Subject: [PATCH] Revert "NFC: static_assert instead of comment" This reverts commit fa36fcff16c7d4f78204d6296bf96c3558a4a672. Causes the following Windows failure: C:\Buildbot\Slave\llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast\llvm.src\lib\CodeGen\MachineInstr.cpp(762): error C2338: must be trivially copyable to memmove llvm-svn: 264516 --- llvm/lib/CodeGen/MachineInstr.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp index 99646d9..bc99a06 100644 --- a/llvm/lib/CodeGen/MachineInstr.cpp +++ b/llvm/lib/CodeGen/MachineInstr.cpp @@ -38,7 +38,6 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/type_traits.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetRegisterInfo.h" @@ -758,8 +757,7 @@ static void moveOperands(MachineOperand *Dst, MachineOperand *Src, if (MRI) return MRI->moveOperands(Dst, Src, NumOps); - static_assert(isPodLike::value, - "must be trivially copyable to memmove"); + // MachineOperand is a trivially copyable type so we can just use memmove. std::memmove(Dst, Src, NumOps * sizeof(MachineOperand)); } -- 2.7.4