[llvm-commits] [llvm] r50943 - in /llvm/trunk: CREDITS.TXT include/llvm/Constants.h include/llvm/GlobalAlias.h include/llvm/GlobalVariable.h include/llvm/InstrTypes.h include/llvm/Instruction.h include/llvm/Instructions.h include/llvm/OperandTraits.h include/llvm/Use.h include/llvm/User.h include/llvm/Value.h lib/Bitcode/Reader/BitcodeReader.cpp lib/Bitcode/Reader/BitcodeReader.h lib/VMCore/ConstantFold.cpp lib/VMCore/Constants.cpp lib/VMCore/Globals.cpp lib/VMCore/Instructions.cpp lib/VMCore/Use.cpp

[Gabor Greif]

Nicholas, and all who still keep branches from
the time where BasicBlock was still derived from User,

now that I have checked in the use-diet changes, you
will have some minor complication when synchronizing
with trunk.

Fortunately the effect is well-scoped and can be fixed easily
by doing a simple:

svn merge -r49379:HEAD \
  https://llvm.org/svn/llvm-project/llvm/branches/ggreif/use-diet/lib/ 
VMCore/BasicBlock.cpp \
  lib/VMCore/BasicBlock.cpp

svn merge -r49379:HEAD \
  https://llvm.org/svn/llvm-project/llvm/branches/ggreif/use-diet/ 
include/llvm/BasicBlock.h \
  include/llvm/BasicBlock.h

in your branch working copy.

NOTE: You may need to tweak the "https://llvm.org" prefix to the URLs
to change the protocol or add a username, though, but svn will give you
a vague hint if this is needed.

I am happy to give a helping hand if something goes awry.

Cheers,

    Gabor