diff options
| -rw-r--r-- | llvm/include/llvm/Support/Format.h | 14 | ||||
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/llvm/include/llvm/Support/Format.h b/llvm/include/llvm/Support/Format.h index 026488cc70f..d5c301cd7e2 100644 --- a/llvm/include/llvm/Support/Format.h +++ b/llvm/include/llvm/Support/Format.h @@ -75,16 +75,6 @@ public: /// printed, this synthesizes the string into a temporary buffer provided and /// returns whether or not it is big enough. -// Helper to validate that format() parameters are scalars or pointers. -template <typename... Args> struct validate_format_parameters; -template <typename Arg, typename... Args> -struct validate_format_parameters<Arg, Args...> { - static_assert(std::is_scalar<Arg>::value, - "format can't be used with non fundamental / non pointer type"); - validate_format_parameters() { validate_format_parameters<Args...>(); } -}; -template <> struct validate_format_parameters<> {}; - template <typename... Ts> class format_object final : public format_object_base { std::tuple<Ts...> Vals; @@ -101,9 +91,7 @@ class format_object final : public format_object_base { public: format_object(const char *fmt, const Ts &... vals) - : format_object_base(fmt), Vals(vals...) { - validate_format_parameters<Ts...>(); - } + : format_object_base(fmt), Vals(vals...) {} int snprint(char *Buffer, unsigned BufferSize) const override { return snprint_tuple(Buffer, BufferSize, index_sequence_for<Ts...>()); diff --git a/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp b/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp index 8197285b7b1..d53c8e38254 100644 --- a/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp +++ b/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp @@ -962,8 +962,7 @@ void PPCVSXSwapRemoval::dumpSwapVector() { DEBUG(dbgs() << format("%6d", ID)); DEBUG(dbgs() << format("%6d", EC->getLeaderValue(ID))); DEBUG(dbgs() << format(" BB#%3d", MI->getParent()->getNumber())); - DEBUG(dbgs() << format(" %14s ", - TII->getName(MI->getOpcode()).str().c_str())); + DEBUG(dbgs() << format(" %14s ", TII->getName(MI->getOpcode()))); if (SwapVector[EntryIdx].IsLoad) DEBUG(dbgs() << "load "); |
