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

Revert "[clang] Allow printing 64 bit ints in diagnostics" 

This reverts commit edfff2f8.

Breaks clang-tidy.
parent 0f37081f

clang/include/clang/AST/Attr.h

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


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

                                             const Attr *At) {

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

  DB.AddTaggedVal(reinterpret_cast<intptr_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<uint64_t>(ND),

  PD.AddTaggedVal(reinterpret_cast<intptr_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<uint64_t>(NNS),

  DB.AddTaggedVal(reinterpret_cast<intptr_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<uint64_t>(T.getAsOpaquePtr()),

  PD.AddTaggedVal(reinterpret_cast<intptr_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 uint64_t and the interpretation depends on exactly

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

  /// what sort of argument kind it is.

  uint64_t DiagArgumentsVal[MaxArguments];

  intptr_t DiagArgumentsVal[MaxArguments];



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

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

  }



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

  void AddTaggedVal(intptr_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

  int64_t getArgSInt(unsigned Idx) const {

  int getArgSInt(unsigned Idx) const {

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

           "invalid argument accessor!");

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

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

  }



  /// Return the specified unsigned integer argument.

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

  uint64_t getArgUInt(unsigned Idx) const {

  unsigned getArgUInt(unsigned Idx) const {

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

           "invalid argument accessor!");

    return DiagObj->DiagStorage.DiagArgumentsVal[Idx];

    return (unsigned)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

  uint64_t getRawArg(unsigned Idx) const {

  intptr_t getRawArg(unsigned Idx) const {

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

           "invalid argument accessor!");

    return DiagObj->DiagStorage.DiagArgumentsVal[Idx];