Commit edfff2f8 authored by Arthur Eubanks's avatar Arthur Eubanks
Browse files

[clang] Allow printing 64 bit ints in diagnostics 

Currently we're limited to 32 bit ints in diagnostics.
With support for 4GB alignments coming soon, we need to report 4GB as the max alignment allowed.
I've tested that this does indeed properly print 2^32.

Reviewed By: rsmith

Differential Revision: https://reviews.llvm.org/D111184
parent 18a7ebda

clang/include/clang/AST/Attr.h

+1 −2
Original line number Diff line number Diff line
@@ -374,8 +374,7 @@ struct ParsedTargetAttr { 


inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,

                                             const Attr *At) {

  DB.AddTaggedVal(reinterpret_cast<intptr_t>(At),

                  DiagnosticsEngine::ak_attr);

  DB.AddTaggedVal(reinterpret_cast<uint64_t>(At), DiagnosticsEngine::ak_attr);

  return DB;

}

}  // end namespace clang

clang/include/clang/AST/Decl.h

+1 −1
Original line number Diff line number Diff line
@@ -4589,7 +4589,7 @@ public: 
/// into a diagnostic with <<.

inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &PD,

                                             const NamedDecl *ND) {

  PD.AddTaggedVal(reinterpret_cast<intptr_t>(ND),

  PD.AddTaggedVal(reinterpret_cast<uint64_t>(ND),

                  DiagnosticsEngine::ak_nameddecl);

  return PD;

}

clang/include/clang/AST/NestedNameSpecifier.h

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ public: 
/// NestedNameSpecifiers into a diagnostic with <<.

inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &DB,

                                             NestedNameSpecifier *NNS) {

  DB.AddTaggedVal(reinterpret_cast<intptr_t>(NNS),

  DB.AddTaggedVal(reinterpret_cast<uint64_t>(NNS),

                  DiagnosticsEngine::ak_nestednamespec);

  return DB;

}

clang/include/clang/AST/Type.h

+1 −1
Original line number Diff line number Diff line
@@ -7146,7 +7146,7 @@ inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &PD, 
/// into a diagnostic with <<.

inline const StreamingDiagnostic &operator<<(const StreamingDiagnostic &PD,

                                             QualType T) {

  PD.AddTaggedVal(reinterpret_cast<intptr_t>(T.getAsOpaquePtr()),

  PD.AddTaggedVal(reinterpret_cast<uint64_t>(T.getAsOpaquePtr()),

                  DiagnosticsEngine::ak_qualtype);

  return PD;

}

clang/include/clang/Basic/Diagnostic.h

+8 −8
Original line number Diff line number Diff line
@@ -164,9 +164,9 @@ struct DiagnosticStorage { 
  /// The values for the various substitution positions.

  ///

  /// This is used when the argument is not an std::string. The specific value

  /// is mangled into an intptr_t and the interpretation depends on exactly

  /// is mangled into an uint64_t and the interpretation depends on exactly

  /// what sort of argument kind it is.

  intptr_t DiagArgumentsVal[MaxArguments];

  uint64_t DiagArgumentsVal[MaxArguments];



  /// The values for the various substitution positions that have

  /// string arguments.
@@ -1179,7 +1179,7 @@ public: 
    DiagStorage = nullptr;

  }



  void AddTaggedVal(intptr_t V, DiagnosticsEngine::ArgumentKind Kind) const {

  void AddTaggedVal(uint64_t V, DiagnosticsEngine::ArgumentKind Kind) const {

    if (!DiagStorage)

      DiagStorage = getStorage();
@@ -1580,18 +1580,18 @@ public: 


  /// Return the specified signed integer argument.

  /// \pre getArgKind(Idx) == DiagnosticsEngine::ak_sint

  int getArgSInt(unsigned Idx) const {

  int64_t getArgSInt(unsigned Idx) const {

    assert(getArgKind(Idx) == DiagnosticsEngine::ak_sint &&

           "invalid argument accessor!");

    return (int)DiagObj->DiagStorage.DiagArgumentsVal[Idx];

    return (int64_t)DiagObj->DiagStorage.DiagArgumentsVal[Idx];

  }



  /// Return the specified unsigned integer argument.

  /// \pre getArgKind(Idx) == DiagnosticsEngine::ak_uint

  unsigned getArgUInt(unsigned Idx) const {

  uint64_t getArgUInt(unsigned Idx) const {

    assert(getArgKind(Idx) == DiagnosticsEngine::ak_uint &&

           "invalid argument accessor!");

    return (unsigned)DiagObj->DiagStorage.DiagArgumentsVal[Idx];

    return DiagObj->DiagStorage.DiagArgumentsVal[Idx];

  }



  /// Return the specified IdentifierInfo argument.
@@ -1605,7 +1605,7 @@ public: 


  /// Return the specified non-string argument in an opaque form.

  /// \pre getArgKind(Idx) != DiagnosticsEngine::ak_std_string

  intptr_t getRawArg(unsigned Idx) const {

  uint64_t getRawArg(unsigned Idx) const {

    assert(getArgKind(Idx) != DiagnosticsEngine::ak_std_string &&

           "invalid argument accessor!");

    return DiagObj->DiagStorage.DiagArgumentsVal[Idx];