[llvm-commits] [poolalloc] r135160 - in /poolalloc/trunk: lib/AssistDS/TypeChecks.cpp runtime/DynamicTypeChecks/TypeRuntime.cpp

[Arushi Aggarwal]

Author: aggarwa4
Date: Thu Jul 14 13:05:45 2011
New Revision: 135160

URL: http://llvm.org/viewvc/llvm-project?rev=135160&view=rev
Log:
Add src pointer to setTypeInfo for debugging purposes.

Modified:
    poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
    poolalloc/trunk/runtime/DynamicTypeChecks/TypeRuntime.cpp

Modified: poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/TypeChecks.cpp?rev=135160&r1=135159&r2=135160&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/TypeChecks.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/TypeChecks.cpp Thu Jul 14 13:05:45 2011
@@ -409,6 +409,7 @@
                                       TypeTagPtrTy,/*metadata*/
                                       Int64Ty,/*size*/
                                       TypeTagTy,
+                                      VoidPtrTy, /*src ptr*/
                                       Int32Ty,/*tag*/
                                       NULL);
   copyTypeInfo = M.getOrInsertFunction("copyTypeInfo",
@@ -2073,6 +2074,7 @@
         Args.push_back(AI);
         Args.push_back(getSizeConstant(SI->getOperand(0)->getType()));
         Args.push_back(getTypeMarkerConstant(SI->getOperand(0)->getType()));
+        Args.push_back(BCI);
         Args.push_back(getTagCounter());
         // Create the call to the runtime check and place it before the copying store instruction.
         CallInst::Create(setTypeInfo, Args.begin(), Args.end(), "", SI);

Modified: poolalloc/trunk/runtime/DynamicTypeChecks/TypeRuntime.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/DynamicTypeChecks/TypeRuntime.cpp?rev=135160&r1=135159&r2=135160&view=diff
==============================================================================
--- poolalloc/trunk/runtime/DynamicTypeChecks/TypeRuntime.cpp (original)
+++ poolalloc/trunk/runtime/DynamicTypeChecks/TypeRuntime.cpp Thu Jul 14 13:05:45 2011
@@ -69,7 +69,7 @@
   void trackInitInst(void *ptr, uint64_t size, uint32_t tag) ;
   void trackUnInitInst(void *ptr, uint64_t size, uint32_t tag) ;
   void copyTypeInfo(void *dstptr, void *srcptr, uint64_t size, uint32_t tag) ;
-  void setTypeInfo(void *dstptr, TypeTagTy *metadata, uint64_t size, TypeTagTy type, uint32_t tag) ;
+  void setTypeInfo(void *dstptr, TypeTagTy *metadata, uint64_t size, TypeTagTy type, void *srcptr, uint32_t tag) ;
   void setVAInfo(void *va_list, uint64_t totalCount, TypeTagTy *metadata_ptr, uint32_t tag) ;
   void copyVAInfo(void *va_list_dst, void *va_list_src, uint32_t tag) ;
   void trackctype(void *ptr, uint32_t tag) ;
@@ -305,7 +305,7 @@
 /**
  * Copy size bytes of metadata from metadata to dest ptr
  */
-void setTypeInfo(void *dstptr, TypeTagTy *metadata, uint64_t size, TypeTagTy type, uint32_t tag) {
+void setTypeInfo(void *dstptr, TypeTagTy *metadata, uint64_t size, TypeTagTy type, void *srcptr, uint32_t tag) {
   if(metadata == NULL) {
     trackStoreInst(dstptr, type, size, tag);
     return;