r301470 - Fix API breaks

[David Blaikie via cfe-commits]

Sorry about that - thought I synced up moments before the commit.

Stuff like this is generally easier to fix forward, imho. Though the fact
that this wouldn't've compiled without the changes does provide some
misgivings about the quality of the patch (but I've certainly committed
some things as shots from the hip that broke the build & were still good to
fix forward)


On Wed, Apr 26, 2017 at 2:14 PM Vedant Kumar <vsk at apple.com> wrote:

> Hi David,
>
> It looks like this conflicts with my revert. I will revert my revert,
> since this seems like it fixes things.
>
> vedant
>
> > On Apr 26, 2017, at 1:58 PM, David Blaikie via cfe-commits <
> cfe-commits at lists.llvm.org> wrote:
> >
> > Author: dblaikie
> > Date: Wed Apr 26 15:58:21 2017
> > New Revision: 301470
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=301470&view=rev
> > Log:
> > Fix API breaks
> >
> > Modified:
> >    cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp
> >    cfe/trunk/lib/CodeGen/MacroPPCallbacks.h
> >
> > Modified: cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp
> > URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp?rev=301470&r1=301469&r2=301470&view=diff
> >
> ==============================================================================
> > --- cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp (original)
> > +++ cfe/trunk/lib/CodeGen/MacroPPCallbacks.cpp Wed Apr 26 15:58:21 2017
> > @@ -198,7 +198,8 @@ void MacroPPCallbacks::MacroDefined(cons
> > }
> >
> > void MacroPPCallbacks::MacroUndefined(const Token &MacroNameTok,
> > -                                      const MacroDefinition &MD) {
> > +                                      const MacroDefinition &MD,
> > +                                      const MacroDirective *Undef) {
> >   IdentifierInfo *Id = MacroNameTok.getIdentifierInfo();
> >   SourceLocation location =
> getCorrectLocation(MacroNameTok.getLocation());
> >   Gen->getCGDebugInfo()->CreateMacro(getCurrentScope(),
> >
> > Modified: cfe/trunk/lib/CodeGen/MacroPPCallbacks.h
> > URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MacroPPCallbacks.h?rev=301470&r1=301469&r2=301470&view=diff
> >
> ==============================================================================
> > --- cfe/trunk/lib/CodeGen/MacroPPCallbacks.h (original)
> > +++ cfe/trunk/lib/CodeGen/MacroPPCallbacks.h Wed Apr 26 15:58:21 2017
> > @@ -110,8 +110,8 @@ public:
> >   /// Hook called whenever a macro \#undef is seen.
> >   ///
> >   /// MD is released immediately following this callback.
> > -  void MacroUndefined(const Token &MacroNameTok,
> > -                      const MacroDefinition &MD) override;
> > +  void MacroUndefined(const Token &MacroNameTok, const MacroDefinition
> &MD,
> > +                      const MacroDirective *Undef) override;
> > };
> >
> > } // end namespace clang
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170426/0b6a4ca1/attachment.html>