diff -r 0c91f0baec58 -r 045ade241ef5 crashanalysercmd/PerfToolsSharedLibraries/Engine/SymbianSymbolLib/QueryAPI/SymbolQueryAPI.cs --- a/crashanalysercmd/PerfToolsSharedLibraries/Engine/SymbianSymbolLib/QueryAPI/SymbolQueryAPI.cs Wed Apr 21 09:51:02 2010 +0300 +++ b/crashanalysercmd/PerfToolsSharedLibraries/Engine/SymbianSymbolLib/QueryAPI/SymbolQueryAPI.cs Fri Aug 27 12:21:46 2010 +0300 @@ -70,19 +70,20 @@ return null; } - // First check with the relocated/activated symbol collections, - // i.e. RAM-loaded code that has been fixed up. - Symbol ret = iRelocator.CollectionList.Lookup( aAddress, out aCollection ); + Symbol ret = null; + // First check from symbol file and then from map files + foreach (SymSource source in SourceManager) + { + if (source.Contains(aAddress)) + { + ret = source.Lookup(aAddress, out aCollection); + break; + } + } + if ( ret == null && aCollection == null ) { - foreach ( SymSource source in SourceManager ) - { - if ( source.Contains( aAddress ) ) - { - ret = source.Lookup( aAddress, out aCollection ); - break; - } - } + ret = iRelocator.CollectionList.Lookup(aAddress, out aCollection); } // Tag the collection because it provided a symbol