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

[Nick Lewycky]

Torok Edwin wrote:
> Author: edwin
> Date: Tue Mar 30 07:31:58 2010
> New Revision: 99885
>
> URL: http://llvm.org/viewvc/llvm-project?rev=99885&view=rev
> Log:
> Honour addGlobalMapping() in the interpreter, if it was used to add mappings for
> external Functions (the JIT does honour this).
>
> 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=99885&r1=99884&r2=99885&view=diff
> ==============================================================================
> --- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp (original)
> +++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Tue Mar 30 07:31:58 2010
> @@ -265,6 +265,7 @@
>     if (RF == RawFunctions->end()) {
>       RawFn = (RawFunc)(intptr_t)
>         sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName());
> +    RawFn = (RawFunc)(intptr_t)getPointerToGlobalIfAvailable(F);

What? Surely you meant:

   [...]
   RawFn = (RawFunc)(intptr_t)getPointerToGlobalIfAvailable(F);
   if (RawFn == 0)
     RawFn = (RawFunc)(intptr_t)
              sys::DynamicLibrary::SearchForAddressOfSymbol(F->getName());
   [...]

right?

Nick

>       if (RawFn != 0)
>         RawFunctions->insert(std::make_pair(F, RawFn));  // Cache for later
>     } else {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>