forked from OSchip/llvm-project
				
			
							parent
							
								
									39c041cae7
								
							
						
					
					
						commit
						c91fa6d19f
					
				| 
						 | 
					@ -123,8 +123,8 @@ namespace {
 | 
				
			||||||
      return FunctionToLazyStubMap;
 | 
					      return FunctionToLazyStubMap;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    GlobalToIndirectSymMapTy& getGlobalToIndirectSymMap(const MutexGuard& locked) {
 | 
					    GlobalToIndirectSymMapTy& getGlobalToIndirectSymMap(const MutexGuard& lck) {
 | 
				
			||||||
      assert(locked.holds(TheJIT->lock));
 | 
					      assert(lck.holds(TheJIT->lock));
 | 
				
			||||||
      return GlobalToIndirectSymMap;
 | 
					      return GlobalToIndirectSymMap;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -132,8 +132,9 @@ namespace {
 | 
				
			||||||
        const MutexGuard &locked, void *CallSite) const {
 | 
					        const MutexGuard &locked, void *CallSite) const {
 | 
				
			||||||
      assert(locked.holds(TheJIT->lock));
 | 
					      assert(locked.holds(TheJIT->lock));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      // The address given to us for the stub may not be exactly right, it might be
 | 
					      // The address given to us for the stub may not be exactly right, it
 | 
				
			||||||
      // a little bit after the stub.  As such, use upper_bound to find it.
 | 
					      // might be a little bit after the stub.  As such, use upper_bound to
 | 
				
			||||||
 | 
					      // find it.
 | 
				
			||||||
      CallSiteToFunctionMapTy::const_iterator I =
 | 
					      CallSiteToFunctionMapTy::const_iterator I =
 | 
				
			||||||
        CallSiteToFunctionMap.upper_bound(CallSite);
 | 
					        CallSiteToFunctionMap.upper_bound(CallSite);
 | 
				
			||||||
      assert(I != CallSiteToFunctionMap.begin() &&
 | 
					      assert(I != CallSiteToFunctionMap.begin() &&
 | 
				
			||||||
| 
						 | 
					@ -659,7 +660,8 @@ void *JITResolver::JITCompilerFn(void *Stub) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // If lazy compilation is disabled, emit a useful error message and abort.
 | 
					    // If lazy compilation is disabled, emit a useful error message and abort.
 | 
				
			||||||
    if (!JR->TheJIT->isCompilingLazily()) {
 | 
					    if (!JR->TheJIT->isCompilingLazily()) {
 | 
				
			||||||
      report_fatal_error("LLVM JIT requested to do lazy compilation of function '"
 | 
					      report_fatal_error("LLVM JIT requested to do lazy compilation of"
 | 
				
			||||||
 | 
					                         " function '"
 | 
				
			||||||
                        + F->getName() + "' when lazy compiles are disabled!");
 | 
					                        + F->getName() + "' when lazy compiles are disabled!");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -859,7 +861,8 @@ bool JITEmitter::finishFunction(MachineFunction &F) {
 | 
				
			||||||
        } else if (MR.isBasicBlock()) {
 | 
					        } else if (MR.isBasicBlock()) {
 | 
				
			||||||
          ResultPtr = (void*)getMachineBasicBlockAddress(MR.getBasicBlock());
 | 
					          ResultPtr = (void*)getMachineBasicBlockAddress(MR.getBasicBlock());
 | 
				
			||||||
        } else if (MR.isConstantPoolIndex()) {
 | 
					        } else if (MR.isConstantPoolIndex()) {
 | 
				
			||||||
          ResultPtr = (void*)getConstantPoolEntryAddress(MR.getConstantPoolIndex());
 | 
					          ResultPtr =
 | 
				
			||||||
 | 
					            (void*)getConstantPoolEntryAddress(MR.getConstantPoolIndex());
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
          assert(MR.isJumpTableIndex());
 | 
					          assert(MR.isJumpTableIndex());
 | 
				
			||||||
          ResultPtr=(void*)getJumpTableEntryAddress(MR.getJumpTableIndex());
 | 
					          ResultPtr=(void*)getJumpTableEntryAddress(MR.getJumpTableIndex());
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue