On Thu, Nov 29, 2012 at 2:26 AM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I tweaked ASTTests in r168867, to remove i128 stuff.<br>
Does it make sense?<br></blockquote><div><br></div><div>Seems fine, thanks.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
...Takumi<br>
<br>
2012/11/29 Richard Smith <<a href="mailto:richard-llvm@metafoo.co.uk">richard-llvm@metafoo.co.uk</a>>:<br>
<div class="HOEnZb"><div class="h5">> Author: rsmith<br>
> Date: Wed Nov 28 23:41:51 2012<br>
> New Revision: 168856<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=168856&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=168856&view=rev</a><br>
> Log:<br>
> Reject uses of __int128 on platforms that don't support it. Also move the ugly<br>
> 'getPointerWidth(0) >= 64' test to be a method on TargetInfo, ready to be<br>
> properly cleaned up.<br>
><br>
> Modified:<br>
> cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
> cfe/trunk/include/clang/Basic/TargetInfo.h<br>
> cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br>
> cfe/trunk/lib/Sema/Sema.cpp<br>
> cfe/trunk/lib/Sema/SemaExpr.cpp<br>
> cfe/trunk/lib/Sema/SemaType.cpp<br>
> cfe/trunk/test/Sema/128bitint.c<br>
> cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp<br>
><br>
> Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
> +++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Wed Nov 28 23:41:51 2012<br>
> @@ -5869,6 +5869,8 @@<br>
> "feature, not permitted in C++">;<br>
> def err_double_requires_fp64 : Error<<br>
> "use of type 'double' requires cl_khr_fp64 extension to be enabled">;<br>
> +def err_int128_unsupported : Error<<br>
> + "__int128 is not supported on this target">;<br>
> def err_nsconsumed_attribute_mismatch : Error<<br>
> "overriding method has mismatched ns_consumed attribute on its"<br>
> " parameter">;<br>
><br>
> Modified: cfe/trunk/include/clang/Basic/TargetInfo.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetInfo.h?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TargetInfo.h?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/include/clang/Basic/TargetInfo.h (original)<br>
> +++ cfe/trunk/include/clang/Basic/TargetInfo.h Wed Nov 28 23:41:51 2012<br>
> @@ -270,6 +270,9 @@<br>
> unsigned getLongLongWidth() const { return LongLongWidth; }<br>
> unsigned getLongLongAlign() const { return LongLongAlign; }<br>
><br>
> + /// \brief Determine whether the __int128 type is supported on this target.<br>
> + bool hasInt128Type() const { return getPointerWidth(0) >= 64; } // FIXME<br>
> +<br>
> /// \brief Return the alignment that is suitable for storing any<br>
> /// object with a fundamental alignment requirement.<br>
> unsigned getSuitableAlign() const { return SuitableAlign; }<br>
><br>
> Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original)<br>
> +++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Wed Nov 28 23:41:51 2012<br>
> @@ -507,6 +507,8 @@<br>
> TI.getTypeWidth(TI.getWCharType()), TI, Builder);<br>
> DefineTypeSizeof("__SIZEOF_WINT_T__",<br>
> TI.getTypeWidth(TI.getWIntType()), TI, Builder);<br>
> + if (TI.hasInt128Type())<br>
> + DefineTypeSizeof("__SIZEOF_INT128__", 128, TI, Builder);<br>
><br>
> DefineType("__INTMAX_TYPE__", TI.getIntMaxType(), Builder);<br>
> DefineType("__UINTMAX_TYPE__", TI.getUIntMaxType(), Builder);<br>
><br>
> Modified: cfe/trunk/lib/Sema/Sema.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.cpp?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/Sema.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/Sema.cpp Wed Nov 28 23:41:51 2012<br>
> @@ -128,7 +128,7 @@<br>
> ExternalSema->InitializeSema(*this);<br>
><br>
> // Initialize predefined 128-bit integer types, if needed.<br>
> - if (PP.getTargetInfo().getPointerWidth(0) >= 64) {<br>
> + if (PP.getTargetInfo().hasInt128Type()) {<br>
> // If either of the 128-bit integer types are unavailable to name lookup,<br>
> // define them now.<br>
> DeclarationName Int128 = &Context.Idents.get("__int128_t");<br>
><br>
> Modified: cfe/trunk/lib/Sema/SemaExpr.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaExpr.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed Nov 28 23:41:51 2012<br>
> @@ -2841,7 +2841,10 @@<br>
> unsigned MaxWidth = Context.getTargetInfo().getIntMaxTWidth();<br>
> // The microsoft literal suffix extensions support 128-bit literals, which<br>
> // may be wider than [u]intmax_t.<br>
> - if (Literal.isMicrosoftInteger && MaxWidth < 128)<br>
> + // FIXME: Actually, they don't. We seem to have accidentally invented the<br>
> + // i128 suffix.<br>
> + if (Literal.isMicrosoftInteger && MaxWidth < 128 &&<br>
> + PP.getTargetInfo().hasInt128Type())<br>
> MaxWidth = 128;<br>
> llvm::APInt ResultVal(MaxWidth, 0);<br>
><br>
> @@ -2911,7 +2914,8 @@<br>
><br>
> // If it doesn't fit in unsigned long long, and we're using Microsoft<br>
> // extensions, then its a 128-bit integer literal.<br>
> - if (Ty.isNull() && Literal.isMicrosoftInteger) {<br>
> + if (Ty.isNull() && Literal.isMicrosoftInteger &&<br>
> + PP.getTargetInfo().hasInt128Type()) {<br>
> if (Literal.isUnsigned)<br>
> Ty = Context.UnsignedInt128Ty;<br>
> else<br>
><br>
> Modified: cfe/trunk/lib/Sema/SemaType.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaType.cpp?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaType.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaType.cpp Wed Nov 28 23:41:51 2012<br>
> @@ -742,6 +742,8 @@<br>
> break;<br>
> }<br>
> case DeclSpec::TST_int128:<br>
> + if (!S.PP.getTargetInfo().hasInt128Type())<br>
> + S.Diag(DS.getTypeSpecTypeLoc(), diag::err_int128_unsupported);<br>
> if (DS.getTypeSpecSign() == DeclSpec::TSS_unsigned)<br>
> Result = Context.UnsignedInt128Ty;<br>
> else<br>
><br>
> Modified: cfe/trunk/test/Sema/128bitint.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/128bitint.c?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/128bitint.c?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/Sema/128bitint.c (original)<br>
> +++ cfe/trunk/test/Sema/128bitint.c Wed Nov 28 23:41:51 2012<br>
> @@ -1,9 +1,13 @@<br>
> -// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-apple-darwin9 -fms-extensions %s<br>
> +// RUN: %clang_cc1 -fsyntax-only -verify -triple x86_64-apple-darwin9 -fms-extensions %s -DHAVE<br>
> +// RUN: %clang_cc1 -fsyntax-only -verify -triple i686-linux-gnu -fms-extensions %s -DHAVE_NOT<br>
> +<br>
> +#ifdef HAVE<br>
> typedef int i128 __attribute__((__mode__(TI)));<br>
> typedef unsigned u128 __attribute__((__mode__(TI)));<br>
><br>
> int a[((i128)-1 ^ (i128)-2) == 1 ? 1 : -1];<br>
> int a[(u128)-1 > 1LL ? 1 : -1];<br>
> +int a[__SIZEOF_INT128__ == 16 ? 1 : -1];<br>
><br>
> // PR5435<br>
> __uint128_t b = (__uint128_t)-1;<br>
> @@ -36,4 +40,12 @@<br>
> {<br>
> MPI_Send(buf, 0x10000000000000001i128); // expected-warning {{implicit conversion from '__int128' to 'int' changes value}}<br>
> }<br>
> +#else<br>
> +<br>
> +__int128 n; // expected-error {{__int128 is not supported on this target}}<br>
> +<br>
> +#if defined(__SIZEOF_INT128__)<br>
> +#error __SIZEOF_INT128__ should not be defined<br>
> +#endif<br>
><br>
> +#endif<br>
><br>
> Modified: cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp?rev=168856&r1=168855&r2=168856&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp?rev=168856&r1=168855&r2=168856&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp (original)<br>
> +++ cfe/trunk/test/SemaCXX/overloaded-builtin-operators.cpp Wed Nov 28 23:41:51 2012<br>
> @@ -1,4 +1,4 @@<br>
> -// RUN: %clang_cc1 -fsyntax-only -fshow-overloads=best -verify %s<br>
> +// RUN: %clang_cc1 -fsyntax-only -fshow-overloads=best -verify -triple x86_64-linux-gnu %s<br>
> // REQUIRES: LP64<br>
><br>
> struct yes;<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br>