Changes in directory llvm/lib/Transforms/Instrumentation:
Makefile updated: 1.6 -> 1.6.6.1
ProfilingUtils.cpp updated: 1.6 -> 1.6.4.1
TraceBasicBlocks.cpp updated: 1.12 -> 1.12.4.1
TraceValues.cpp updated: 1.74 -> 1.74.4.1
---
Log message:
Merged mainline into Vector LLVM branch
---
Diffs of the changes: (+10 -8)
Makefile | 2 +-
ProfilingUtils.cpp | 3 ++-
TraceBasicBlocks.cpp | 2 +-
TraceValues.cpp | 11 ++++++-----
4 files changed, 10 insertions(+), 8 deletions(-)
Index: llvm/lib/Transforms/Instrumentation/Makefile
diff -u llvm/lib/Transforms/Instrumentation/Makefile:1.6
llvm/lib/Transforms/Instrumentation/Makefile:1.6.6.1
--- llvm/lib/Transforms/Instrumentation/Makefile:1.6 Wed Oct 27 18:18:45 2004
+++ llvm/lib/Transforms/Instrumentation/Makefile Wed Nov 16 12:32:50 2005
@@ -6,9 +6,9 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../../..
LIBRARYNAME = LLVMInstrumentation
-PARALLEL_DIRS = ProfilePaths
BUILD_ARCHIVE = 1
include $(LEVEL)/Makefile.common
Index: llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp:1.6
llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp:1.6.4.1
--- llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp:1.6 Thu Apr 21
18:40:46 2005
+++ llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp Wed Nov 16
12:32:50 2005
@@ -26,7 +26,8 @@
const PointerType *UIntPtr = PointerType::get(Type::UIntTy);
Module &M = *MainFn->getParent();
Function *InitFn = M.getOrInsertFunction(FnName, Type::IntTy, Type::IntTy,
- ArgVTy, UIntPtr, Type::UIntTy, 0);
+ ArgVTy, UIntPtr, Type::UIntTy,
+ (Type *)0);
// This could force argc and argv into programs that wouldn't otherwise have
// them, but instead we just pass null values in.
Index: llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
diff -u llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.12
llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.12.4.1
--- llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp:1.12 Sat Apr
23 16:38:35 2005
+++ llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp Wed Nov 16
12:32:50 2005
@@ -46,7 +46,7 @@
<< "\", \"" << FnName << "\", " << BBNumber << ")\n");
Module &M = *BB->getParent ()->getParent ();
Function *InstrFn = M.getOrInsertFunction (FnName, Type::VoidTy,
- Type::UIntTy, 0);
+ Type::UIntTy, (Type *)0);
std::vector<Value*> Args (1);
Args[0] = ConstantUInt::get (Type::UIntTy, BBNumber);
Index: llvm/lib/Transforms/Instrumentation/TraceValues.cpp
diff -u llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.74
llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.74.4.1
--- llvm/lib/Transforms/Instrumentation/TraceValues.cpp:1.74 Sat Apr 23
16:38:35 2005
+++ llvm/lib/Transforms/Instrumentation/TraceValues.cpp Wed Nov 16 12:32:50 2005
@@ -130,17 +130,18 @@
// uint (sbyte*)
HashPtrFunc = M.getOrInsertFunction("HashPointerToSeqNum", Type::UIntTy, SBP,
- 0);
+ (Type *)0);
// void (sbyte*)
ReleasePtrFunc = M.getOrInsertFunction("ReleasePointerSeqNum",
- Type::VoidTy, SBP, 0);
+ Type::VoidTy, SBP, (Type *)0);
RecordPtrFunc = M.getOrInsertFunction("RecordPointer",
- Type::VoidTy, SBP, 0);
+ Type::VoidTy, SBP, (Type *)0);
- PushOnEntryFunc = M.getOrInsertFunction("PushPointerSet", Type::VoidTy, 0);
+ PushOnEntryFunc = M.getOrInsertFunction("PushPointerSet", Type::VoidTy,
+ (Type *)0);
ReleaseOnReturnFunc = M.getOrInsertFunction("ReleasePointersPopSet",
- Type::VoidTy, 0);
+ Type::VoidTy, (Type *)0);
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
