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