<div dir="ltr">This broke our Windows builders.<div><br></div><div>VS 2013, x64. This was the only commit in the build, and all subsequent builds fail.</div><div>Can you take a look, please? :-)</div><div><br></div><div>Error output:</div><div>-------------</div><div><div>[967/1550] Building CXX object lib\Target\X86\Utils\CMakeFiles\LLVMX86Utils.dir\X86ShuffleDecode.cpp.obj</div><div>[968/1550] Building CXX object lib\Target\X86\MCTargetDesc\CMakeFiles\LLVMX86Desc.dir\X86AsmBackend.cpp.obj</div><div>FAILED: C:\PROGRA~2\MICROS~1.0\VC\bin\amd64\cl.exe /nologo /TP /DWIN32 /D_WINDOWS /W3 /MD /O2 /Ob2 /D NDEBUG -Ilib\Target\X86\InstPrinter -IC:\Buildbot\Slave\builds\1.LLVM.Windows.Phase.1\llvm.src\lib\Target\X86\InstPrinter -IC:\Buildbot\Slave\builds\1.LLVM.Windows.Phase.1\llvm.src\lib\Target\X86 -Ilib\Target\X86 -Iinclude -IC:\Buildbot\Slave\builds\1.LLVM.Windows.Phase.1\llvm.src\include -wd4146 -wd4180 -wd4244 -wd4258 -wd4267 -wd4291 -wd4345 -wd4351 -wd4355 -wd4456 -wd4457 -wd4458 -wd4459 -wd4503 -wd4624 -wd4722 -wd4800 -w14062 -we4238 /EHs-c- /GR- /showIncludes -DGTEST_HAS_RTTI=0 -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS /Folib\Target\X86\InstPrinter\CMakeFiles\LLVMX86AsmPrinter.dir\X86ATTInstPrinter.cpp.obj /Fdlib\Target\X86\InstPrinter\CMakeFiles\LLVMX86AsmPrinter.dir\ /FS -c C:\Buildbot\Slave\builds\1.LLVM.Windows.Phase.1\llvm.src\lib\Target\X86\InstPrinter\X86ATTInstPrinter.cpp</div><div>lib\Target\X86\X86GenAsmWriter.inc(20509) : error C2022: '13108704' : too big for character</div><div>lib\Target\X86\X86GenRegisterInfo.inc(5798) : warning C4305: 'initializing' : truncation from 'int' to 'uint8_t'</div><div>lib\Target\X86\X86GenRegisterInfo.inc(5798) : warning C4309: 'initializing' : truncation of constant value</div><div>ninja: build stopped: subcommand failed.</div></div><div>--------</div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature"> Filipe<br></div></div>
<br><div class="gmail_quote">On Sun, Feb 15, 2015 at 2:15 PM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Sun Feb 15 16:15:41 2015<br>
New Revision: 229337<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229337&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229337&view=rev</a><br>
Log:<br>
Format: Modernize using variadic templates.<br>
<br>
Introduces a subset of C++14 integer sequences in STLExtras. This is<br>
just enough to support unpacking a std::tuple into the arguments of<br>
snprintf, we can add more of it when it's actually needed.<br>
<br>
Also removes an ancient macro hack that leaks a macro into the global<br>
namespace. Clean up users that made use of the convenient hack.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/ADT/STLExtras.h<br>
llvm/trunk/include/llvm/MC/MCInstPrinter.h<br>
llvm/trunk/include/llvm/Support/Format.h<br>
llvm/trunk/lib/MC/MCInstPrinter.cpp<br>
llvm/trunk/lib/Support/raw_ostream.cpp<br>
llvm/trunk/unittests/IR/UseTest.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/STLExtras.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/STLExtras.h?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/STLExtras.h?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ADT/STLExtras.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/STLExtras.h Sun Feb 15 16:15:41 2015<br>
@@ -194,6 +194,28 @@ struct less_second {<br>
}<br>
};<br>
<br>
+// A subset of N3658. More stuff can be added as-needed.<br>
+<br>
+/// \brief Represents a compile-time sequence of integers.<br>
+template <class T, T... I> struct integer_sequence {<br>
+ typedef T value_type;<br>
+<br>
+ static LLVM_CONSTEXPR size_t size() { return sizeof...(I); }<br>
+};<br>
+<br>
+template <std::size_t N, std::size_t... I><br>
+struct build_index_impl : build_index_impl<N - 1, N - 1, I...> {};<br>
+template <std::size_t... I><br>
+struct build_index_impl<0, I...> : integer_sequence<std::size_t, I...> {};<br>
+<br>
+/// \brief Alias for the common case of a sequence of size_ts.<br>
+template <size_t... I><br>
+using index_sequence = integer_sequence<std::size_t, I...>;<br>
+<br>
+/// \brief Creates a compile-time integer sequence for a parameter pack.<br>
+template <class... Ts><br>
+using index_sequence_for = build_index_impl<sizeof...(Ts)>;<br>
+<br>
//===----------------------------------------------------------------------===//<br>
// Extra additions for arrays<br>
//===----------------------------------------------------------------------===//<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCInstPrinter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCInstPrinter.h?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCInstPrinter.h?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCInstPrinter.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCInstPrinter.h Sun Feb 15 16:15:41 2015<br>
@@ -95,14 +95,14 @@ public:<br>
void setPrintImmHex(HexStyle::Style Value) { PrintHexStyle = Value; }<br>
<br>
/// Utility function to print immediates in decimal or hex.<br>
- format_object1<int64_t> formatImm(const int64_t Value) const {<br>
+ format_object<int64_t> formatImm(int64_t Value) const {<br>
return PrintImmHex ? formatHex(Value) : formatDec(Value);<br>
}<br>
<br>
/// Utility functions to print decimal/hexadecimal values.<br>
- format_object1<int64_t> formatDec(const int64_t Value) const;<br>
- format_object1<int64_t> formatHex(const int64_t Value) const;<br>
- format_object1<uint64_t> formatHex(const uint64_t Value) const;<br>
+ format_object<int64_t> formatDec(int64_t Value) const;<br>
+ format_object<int64_t> formatHex(int64_t Value) const;<br>
+ format_object<uint64_t> formatHex(uint64_t Value) const;<br>
};<br>
<br>
} // namespace llvm<br>
<br>
Modified: llvm/trunk/include/llvm/Support/Format.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Format.h?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Format.h?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/Format.h (original)<br>
+++ llvm/trunk/include/llvm/Support/Format.h Sun Feb 15 16:15:41 2015<br>
@@ -23,18 +23,12 @@<br>
#ifndef LLVM_SUPPORT_FORMAT_H<br>
#define LLVM_SUPPORT_FORMAT_H<br>
<br>
+#include "llvm/ADT/STLExtras.h"<br>
#include "llvm/ADT/StringRef.h"<br>
#include "llvm/Support/DataTypes.h"<br>
#include <cassert><br>
#include <cstdio><br>
-#ifdef _MSC_VER<br>
-// FIXME: This define is wrong:<br>
-// - _snprintf does not guarantee that trailing null is always added - if<br>
-// there is no space for null, it does not report any error.<br>
-// - According to C++ standard, snprintf should be visible in the 'std'<br>
-// namespace - this define makes this impossible.<br>
-#define snprintf _snprintf<br>
-#endif<br>
+#include <tuple><br>
<br>
namespace llvm {<br>
<br>
@@ -80,101 +74,26 @@ public:<br>
/// printed, this synthesizes the string into a temporary buffer provided and<br>
/// returns whether or not it is big enough.<br>
<br>
-template <typename T><br>
-class format_object1 final : public format_object_base {<br>
- T Val;<br>
-public:<br>
- format_object1(const char *fmt, const T &val)<br>
- : format_object_base(fmt), Val(val) {<br>
- }<br>
-<br>
- int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val);<br>
- }<br>
-};<br>
-<br>
-template <typename T1, typename T2><br>
-class format_object2 final : public format_object_base {<br>
- T1 Val1;<br>
- T2 Val2;<br>
-public:<br>
- format_object2(const char *fmt, const T1 &val1, const T2 &val2)<br>
- : format_object_base(fmt), Val1(val1), Val2(val2) {<br>
- }<br>
-<br>
- int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val1, Val2);<br>
- }<br>
-};<br>
-<br>
-template <typename T1, typename T2, typename T3><br>
-class format_object3 final : public format_object_base {<br>
- T1 Val1;<br>
- T2 Val2;<br>
- T3 Val3;<br>
-public:<br>
- format_object3(const char *fmt, const T1 &val1, const T2 &val2,const T3 &val3)<br>
- : format_object_base(fmt), Val1(val1), Val2(val2), Val3(val3) {<br>
- }<br>
-<br>
- int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val1, Val2, Val3);<br>
- }<br>
-};<br>
-<br>
-template <typename T1, typename T2, typename T3, typename T4><br>
-class format_object4 final : public format_object_base {<br>
- T1 Val1;<br>
- T2 Val2;<br>
- T3 Val3;<br>
- T4 Val4;<br>
-public:<br>
- format_object4(const char *fmt, const T1 &val1, const T2 &val2,<br>
- const T3 &val3, const T4 &val4)<br>
- : format_object_base(fmt), Val1(val1), Val2(val2), Val3(val3), Val4(val4) {<br>
- }<br>
-<br>
- int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val1, Val2, Val3, Val4);<br>
+template <typename... Ts><br>
+class format_object final : public format_object_base {<br>
+ std::tuple<Ts...> Vals;<br>
+<br>
+ template <std::size_t... Is><br>
+ int snprint_tuple(char *Buffer, unsigned BufferSize,<br>
+ index_sequence<Is...>) const {<br>
+#ifdef _MSC_VER<br>
+ return _snprintf(Buffer, BufferSize, Fmt, std::get<Is>(Vals)...);<br>
+#else<br>
+ return std::snprintf(Buffer, BufferSize, Fmt, std::get<Is>(Vals)...);<br>
+#endif<br>
}<br>
-};<br>
<br>
-template <typename T1, typename T2, typename T3, typename T4, typename T5><br>
-class format_object5 final : public format_object_base {<br>
- T1 Val1;<br>
- T2 Val2;<br>
- T3 Val3;<br>
- T4 Val4;<br>
- T5 Val5;<br>
public:<br>
- format_object5(const char *fmt, const T1 &val1, const T2 &val2,<br>
- const T3 &val3, const T4 &val4, const T5 &val5)<br>
- : format_object_base(fmt), Val1(val1), Val2(val2), Val3(val3), Val4(val4),<br>
- Val5(val5) {<br>
- }<br>
+ format_object(const char *fmt, const Ts &... vals)<br>
+ : format_object_base(fmt), Vals(vals...) {}<br>
<br>
int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val1, Val2, Val3, Val4, Val5);<br>
- }<br>
-};<br>
-<br>
-template <typename T1, typename T2, typename T3, typename T4, typename T5,<br>
- typename T6><br>
-class format_object6 final : public format_object_base {<br>
- T1 Val1;<br>
- T2 Val2;<br>
- T3 Val3;<br>
- T4 Val4;<br>
- T5 Val5;<br>
- T6 Val6;<br>
-public:<br>
- format_object6(const char *Fmt, const T1 &Val1, const T2 &Val2,<br>
- const T3 &Val3, const T4 &Val4, const T5 &Val5, const T6 &Val6)<br>
- : format_object_base(Fmt), Val1(Val1), Val2(Val2), Val3(Val3), Val4(Val4),<br>
- Val5(Val5), Val6(Val6) { }<br>
-<br>
- int snprint(char *Buffer, unsigned BufferSize) const override {<br>
- return snprintf(Buffer, BufferSize, Fmt, Val1, Val2, Val3, Val4, Val5, Val6);<br>
+ return snprint_tuple(Buffer, BufferSize, index_sequence_for<Ts...>());<br>
}<br>
};<br>
<br>
@@ -187,44 +106,9 @@ public:<br>
/// OS << format("%0.4f", myfloat) << '\n';<br>
/// \endcode<br>
<br>
-template <typename T><br>
-inline format_object1<T> format(const char *Fmt, const T &Val) {<br>
- return format_object1<T>(Fmt, Val);<br>
-}<br>
-<br>
-template <typename T1, typename T2><br>
-inline format_object2<T1, T2> format(const char *Fmt, const T1 &Val1,<br>
- const T2 &Val2) {<br>
- return format_object2<T1, T2>(Fmt, Val1, Val2);<br>
-}<br>
-<br>
-template <typename T1, typename T2, typename T3><br>
- inline format_object3<T1, T2, T3> format(const char *Fmt, const T1 &Val1,<br>
- const T2 &Val2, const T3 &Val3) {<br>
- return format_object3<T1, T2, T3>(Fmt, Val1, Val2, Val3);<br>
-}<br>
-<br>
-template <typename T1, typename T2, typename T3, typename T4><br>
-inline format_object4<T1, T2, T3, T4> format(const char *Fmt, const T1 &Val1,<br>
- const T2 &Val2, const T3 &Val3,<br>
- const T4 &Val4) {<br>
- return format_object4<T1, T2, T3, T4>(Fmt, Val1, Val2, Val3, Val4);<br>
-}<br>
-<br>
-template <typename T1, typename T2, typename T3, typename T4, typename T5><br>
-inline format_object5<T1, T2, T3, T4, T5> format(const char *Fmt,const T1 &Val1,<br>
- const T2 &Val2, const T3 &Val3,<br>
- const T4 &Val4, const T5 &Val5) {<br>
- return format_object5<T1, T2, T3, T4, T5>(Fmt, Val1, Val2, Val3, Val4, Val5);<br>
-}<br>
-<br>
-template <typename T1, typename T2, typename T3, typename T4, typename T5,<br>
- typename T6><br>
-inline format_object6<T1, T2, T3, T4, T5, T6><br>
-format(const char *Fmt, const T1 &Val1, const T2 &Val2, const T3 &Val3,<br>
- const T4 &Val4, const T5 &Val5, const T6 &Val6) {<br>
- return format_object6<T1, T2, T3, T4, T5, T6>(Fmt, Val1, Val2, Val3, Val4,<br>
- Val5, Val6);<br>
+template <typename... Ts><br>
+inline format_object<Ts...> format(const char *Fmt, const Ts &... Vals) {<br>
+ return format_object<Ts...>(Fmt, Vals...);<br>
}<br>
<br>
/// This is a helper class used for left_justify() and right_justify().<br>
<br>
Modified: llvm/trunk/lib/MC/MCInstPrinter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCInstPrinter.cpp?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCInstPrinter.cpp?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/MC/MCInstPrinter.cpp (original)<br>
+++ llvm/trunk/lib/MC/MCInstPrinter.cpp Sun Feb 15 16:15:41 2015<br>
@@ -69,11 +69,11 @@ static bool needsLeadingZero(uint64_t Va<br>
return false;<br>
}<br>
<br>
-format_object1<int64_t> MCInstPrinter::formatDec(const int64_t Value) const {<br>
+format_object<int64_t> MCInstPrinter::formatDec(int64_t Value) const {<br>
return format("%" PRId64, Value);<br>
}<br>
<br>
-format_object1<int64_t> MCInstPrinter::formatHex(const int64_t Value) const {<br>
+format_object<int64_t> MCInstPrinter::formatHex(int64_t Value) const {<br>
switch(PrintHexStyle) {<br>
case HexStyle::C:<br>
if (Value < 0)<br>
@@ -96,7 +96,7 @@ format_object1<int64_t> MCInstPrinter::f<br>
llvm_unreachable("unsupported print style");<br>
}<br>
<br>
-format_object1<uint64_t> MCInstPrinter::formatHex(const uint64_t Value) const {<br>
+format_object<uint64_t> MCInstPrinter::formatHex(uint64_t Value) const {<br>
switch(PrintHexStyle) {<br>
case HexStyle::C:<br>
return format("0x%" PRIx64, Value);<br>
<br>
Modified: llvm/trunk/lib/Support/raw_ostream.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/raw_ostream.cpp?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Support/raw_ostream.cpp (original)<br>
+++ llvm/trunk/lib/Support/raw_ostream.cpp Sun Feb 15 16:15:41 2015<br>
@@ -242,7 +242,7 @@ raw_ostream &raw_ostream::operator<<(dou<br>
<br>
char buf[16];<br>
unsigned len;<br>
- len = snprintf(buf, sizeof(buf), "%e", N);<br>
+ len = format("%e", N).snprint(buf, sizeof(buf));<br>
if (len <= sizeof(buf) - 2) {<br>
if (len >= 5 && buf[len - 5] == 'e' && buf[len - 3] == '0') {<br>
int cs = buf[len - 4];<br>
<br>
Modified: llvm/trunk/unittests/IR/UseTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/UseTest.cpp?rev=229337&r1=229336&r2=229337&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/UseTest.cpp?rev=229337&r1=229336&r2=229337&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/unittests/IR/UseTest.cpp (original)<br>
+++ llvm/trunk/unittests/IR/UseTest.cpp Sun Feb 15 16:15:41 2015<br>
@@ -50,7 +50,7 @@ TEST(UseTest, sort) {<br>
});<br>
unsigned I = 0;<br>
for (User *U : X.users()) {<br>
- snprintf(vnbuf, sizeof(vnbuf), "v%u", I++);<br>
+ format("v%u", I++).snprint(vnbuf, sizeof(vnbuf));<br>
EXPECT_EQ(vnbuf, U->getName());<br>
}<br>
ASSERT_EQ(8u, I);<br>
@@ -60,7 +60,7 @@ TEST(UseTest, sort) {<br>
});<br>
I = 0;<br>
for (User *U : X.users()) {<br>
- snprintf(vnbuf, sizeof(vnbuf), "v%u", (7 - I++));<br>
+ format("v%u", (7 - I++)).snprint(vnbuf, sizeof(vnbuf));<br>
EXPECT_EQ(vnbuf, U->getName());<br>
}<br>
ASSERT_EQ(8u, I);<br>
@@ -95,7 +95,7 @@ TEST(UseTest, reverse) {<br>
});<br>
unsigned I = 0;<br>
for (User *U : X.users()) {<br>
- snprintf(vnbuf, sizeof(vnbuf), "v%u", I++);<br>
+ format("v%u", I++).snprint(vnbuf, sizeof(vnbuf));<br>
EXPECT_EQ(vnbuf, U->getName());<br>
}<br>
ASSERT_EQ(8u, I);<br>
@@ -103,7 +103,7 @@ TEST(UseTest, reverse) {<br>
X.reverseUseList();<br>
I = 0;<br>
for (User *U : X.users()) {<br>
- snprintf(vnbuf, sizeof(vnbuf), "v%u", (7 - I++));<br>
+ format("v%u", (7 - I++)).snprint(vnbuf, sizeof(vnbuf));<br>
EXPECT_EQ(vnbuf, U->getName());<br>
}<br>
ASSERT_EQ(8u, I);<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>