forks
/
DCD
mirror of https://github.com/dlang-community/DCD.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix memory corruption

This commit is contained in:
Hackerpilot 2014-05-10 03:02:34 -07:00
parent 48981fbfaa
commit 80e3ad1f57
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modulecache.d
View File

@ -126,9 +126,13 @@ struct ModuleCache
return []; return [];
} }
Log.info("Getting symbols for ", location); string cachedLocation = stringCache.intern(location);
Log.info("Getting symbols for ", cachedLocation);
recursionGuard.insert(cachedLocation);
recursionGuard.insert(location);
ACSymbol*[] symbols; ACSymbol*[] symbols;
// try // try
@ -136,11 +140,11 @@ struct ModuleCache
import core.memory; import core.memory;
import std.stdio; import std.stdio;
import std.typecons; import std.typecons;
File f = File(location); File f = File(cachedLocation);
ubyte[] source = cast(ubyte[]) Mallocator.it.allocate(cast(size_t)f.size); ubyte[] source = cast(ubyte[]) Mallocator.it.allocate(cast(size_t)f.size);
f.rawRead(source); f.rawRead(source);
LexerConfig config; LexerConfig config;
config.fileName = location; config.fileName = cachedLocation;
shared parseStringCache = shared StringCache(StringCache.defaultBucketCount); shared parseStringCache = shared StringCache(StringCache.defaultBucketCount);
auto semanticAllocator = scoped!(CAllocatorImpl!(BlockAllocator!(1024 * 64))); auto semanticAllocator = scoped!(CAllocatorImpl!(BlockAllocator!(1024 * 64)));
DynamicArray!(Token, false) tokens; DynamicArray!(Token, false) tokens;
@ -151,17 +155,17 @@ struct ModuleCache
tokens.insert(t); tokens.insert(t);
Mallocator.it.deallocate(source); Mallocator.it.deallocate(source);
Module m = parseModuleSimple(tokens[], location, semanticAllocator); Module m = parseModuleSimple(tokens[], cachedLocation, semanticAllocator);
assert (symbolAllocator); assert (symbolAllocator);
auto first = scoped!FirstPass(m, location, stringCache, auto first = scoped!FirstPass(m, cachedLocation, stringCache,
symbolAllocator, semanticAllocator); symbolAllocator, semanticAllocator);
first.run(); first.run();
SecondPass second = SecondPass(first); SecondPass second = SecondPass(first);
second.run(); second.run();
ThirdPass third = ThirdPass(second, location); ThirdPass third = ThirdPass(second, cachedLocation);
third.run(); third.run();
symbols = cast(ACSymbol*[]) Mallocator.it.allocate( symbols = cast(ACSymbol*[]) Mallocator.it.allocate(
@ -181,11 +185,11 @@ struct ModuleCache
// } // }
SysTime access; SysTime access;
SysTime modification; SysTime modification;
getTimes(location, access, modification); getTimes(cachedLocation, access, modification);
CacheEntry* c = allocate!CacheEntry(Mallocator.it, symbols, CacheEntry* c = allocate!CacheEntry(Mallocator.it, symbols,
modification, stringCache.intern(location)); modification, cachedLocation);
cache.insert(c); cache.insert(c);
recursionGuard.remove(location); recursionGuard.remove(cachedLocation);
return symbols; return symbols;
} }