[llvm-commits] [llvm] r99886 - /llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp

[Török Edwin]

On 03/31/2010 11:12 AM, Nick Lewycky wrote:
> Torok Edwin wrote:
>> Author: edwin
>> Date: Tue Mar 30 07:52:03 2010
>> New Revision: 99886
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=99886&view=rev
>> Log:
>> Don't overwrite previous value, if it succeeded.
>>
>> Modified:
>>      llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
>>
>> Modified:
>> llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp?rev=99886&r1=99885&r2=99886&view=diff
>>
>> ==============================================================================
>>
>> --- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
>> (original)
>> +++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
>> Tue Mar 30 07:52:03 2010
>> @@ -265,7 +265,8 @@
>>     if (RF == RawFunctions->end()) {
>>       RawFn = (RawFunc)(intptr_t)
>>         sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName());
>> -    RawFn = (RawFunc)(intptr_t)getPointerToGlobalIfAvailable(F);
>> +    if (!RawnFn)
>> +    RawFn = (RawFunc)(intptr_t)getPointerToGlobalIfAvailable(F);
> 
> Oh, I didn't see this commit before my last email :)
> 
> So, if I assign a value through addGlobalMapping, I really expect it to
> take precedence over calling dlsym.

Right, I'll fix that soon.

Best regards,
--Edwin