src/share/vm/shark/sharkMemoryManager.cpp

*** 57,90 ****
    SharkEntry *entry = get_entry_for_function(F);
    if (entry != NULL)
      entry->set_code_limit(FunctionEnd);
  }
  
- unsigned char* SharkMemoryManager::startExceptionTable(const Function* F,
-                                                        uintptr_t& ActualSize) {
-   return mm()->startExceptionTable(F, ActualSize);
- }
- 
- void SharkMemoryManager::endExceptionTable(const Function* F,
-                                            unsigned char* TableStart,
-                                            unsigned char* TableEnd,
-                                            unsigned char* FrameRegister) {
-   mm()->endExceptionTable(F, TableStart, TableEnd, FrameRegister);
- }
- 
  void SharkMemoryManager::setMemoryWritable() {
    mm()->setMemoryWritable();
  }
  
  void SharkMemoryManager::setMemoryExecutable() {
    mm()->setMemoryExecutable();
  }
  
- void SharkMemoryManager::deallocateExceptionTable(void *ptr) {
-   mm()->deallocateExceptionTable(ptr);
- }
- 
  void SharkMemoryManager::deallocateFunctionBody(void *ptr) {
    mm()->deallocateFunctionBody(ptr);
  }
  
  uint8_t* SharkMemoryManager::allocateGlobal(uintptr_t Size,
--- 57,74 ----
*** 94,114 ****
  
  void* SharkMemoryManager::getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) {
    return mm()->getPointerToNamedFunction(Name, AbortOnFailure);
  }
  
  uint8_t* SharkMemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    return mm()->allocateCodeSection(Size, Alignment, SectionID);
  }
  
  uint8_t* SharkMemoryManager::allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    return mm()->allocateDataSection(Size, Alignment, SectionID);
  }
  
! void SharkMemoryManager::setPoisonMemory(bool poison) {
!   mm()->setPoisonMemory(poison);
  }
  
! unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size,
!                                                  unsigned int Alignment) {
!   return mm()->allocateSpace(Size, Alignment);
  }
--- 78,132 ----
  
  void* SharkMemoryManager::getPointerToNamedFunction(const std::string &Name, bool AbortOnFailure) {
    return mm()->getPointerToNamedFunction(Name, AbortOnFailure);
  }
  
+ void SharkMemoryManager::setPoisonMemory(bool poison) {
+   mm()->setPoisonMemory(poison);
+ }
+ 
+ unsigned char *SharkMemoryManager::allocateSpace(intptr_t Size,
+                                                  unsigned int Alignment) {
+   return mm()->allocateSpace(Size, Alignment);
+ }
+ 
+ #if SHARK_LLVM_VERSION <= 32
+ 
  uint8_t* SharkMemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    return mm()->allocateCodeSection(Size, Alignment, SectionID);
  }
  
  uint8_t* SharkMemoryManager::allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID) {
    return mm()->allocateDataSection(Size, Alignment, SectionID);
  }
  
! void SharkMemoryManager::deallocateExceptionTable(void *ptr) {
!   mm()->deallocateExceptionTable(ptr);
  }
  
! unsigned char* SharkMemoryManager::startExceptionTable(const Function* F,
!                                                        uintptr_t& ActualSize) {
!   return mm()->startExceptionTable(F, ActualSize);
  }
+ 
+ void SharkMemoryManager::endExceptionTable(const Function* F,
+                                            unsigned char* TableStart,
+                                            unsigned char* TableEnd,
+                                            unsigned char* FrameRegister) {
+   mm()->endExceptionTable(F, TableStart, TableEnd, FrameRegister);
+ }
+ 
+ #else
+ 
+ uint8_t *SharkMemoryManager::allocateCodeSection(uintptr_t Size, unsigned Alignment, unsigned SectionID, StringRef SectionName) {
+     return mm()->allocateCodeSection(Size, Alignment, SectionID, SectionName);
+ }
+ 
+ uint8_t* SharkMemoryManager::allocateDataSection(uintptr_t Size, unsigned Alignment, unsigned SectionID, StringRef SectionName, bool IsReadOnly) {
+   return mm()->allocateDataSection(Size, Alignment, SectionID, SectionName, IsReadOnly);
+ }
+ 
+ bool SharkMemoryManager::finalizeMemory(std::string *ErrMsg) {
+     return mm()->finalizeMemory(ErrMsg);
+ }
+ 
+ #endif