diff options
| -rw-r--r-- | llvm/include/llvm/Bitcode/Serialize.h | 9 | ||||
| -rw-r--r-- | llvm/lib/Bitcode/Writer/Serialize.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/llvm/include/llvm/Bitcode/Serialize.h b/llvm/include/llvm/Bitcode/Serialize.h index 72aac9d0ba4..be5adb85eaa 100644 --- a/llvm/include/llvm/Bitcode/Serialize.h +++ b/llvm/include/llvm/Bitcode/Serialize.h @@ -27,7 +27,7 @@ class Serializer { SmallVector<uint64_t,10> Record; bool inBlock; - typedef DenseMap<void*,unsigned> MapTy; + typedef DenseMap<const void*,unsigned> MapTy; MapTy PtrMap; public: @@ -42,7 +42,10 @@ public: void EmitCStr(const char* beg, const char* end); void EmitCStr(const char* cstr); - void EmitPtr(void* ptr) { EmitInt(getPtrId(ptr)); } + void EmitPtr(const void* ptr) { EmitInt(getPtrId(ptr)); } + + template <typename T> + void EmitRef(const T& ref) { EmitPtr(&ref); } template <typename T> void EmitOwnedPtr(T* ptr) { @@ -55,7 +58,7 @@ public: private: void EmitRecord(); inline bool inRecord() { return Record.size() > 0; } - unsigned getPtrId(void* ptr); + unsigned getPtrId(const void* ptr); }; } // end namespace llvm diff --git a/llvm/lib/Bitcode/Writer/Serialize.cpp b/llvm/lib/Bitcode/Writer/Serialize.cpp index a1d732047a6..58baf104c7a 100644 --- a/llvm/lib/Bitcode/Writer/Serialize.cpp +++ b/llvm/lib/Bitcode/Writer/Serialize.cpp @@ -57,7 +57,7 @@ void Serializer::EmitCStr(const char* s) { EmitCStr(s,s+strlen(s)); } -unsigned Serializer::getPtrId(void* ptr) { +unsigned Serializer::getPtrId(const void* ptr) { if (!ptr) return 0; |
