diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-10-14 15:01:24 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-10-14 15:43:21 -0700 |
| commit | 6e88ef6b604a7a945a466784580c42e6554c1289 (patch) | |
| tree | 1e296564787b51514cf2eca5b732647c1a82912e /patchoat | |
| parent | 58e51f38e2304a08aa9ec380383e0b3614f96a96 (diff) | |
| download | art-6e88ef6b604a7a945a466784580c42e6554c1289.zip art-6e88ef6b604a7a945a466784580c42e6554c1289.tar.gz art-6e88ef6b604a7a945a466784580c42e6554c1289.tar.bz2 | |
Change MemMap::maps_ to not be global variable
Runtime.exit() was causing globals to get destructed at the same time
that another thread was using it for allocating a new mem map.
Bug: 17962201
Change-Id: I400cb7b8141d858f3c08a6fe59a02838c04c6962
Diffstat (limited to 'patchoat')
| -rw-r--r-- | patchoat/patchoat.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index 4ed428c..504addc 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -758,6 +758,7 @@ static File* CreateOrOpen(const char* name, bool* created) { static int patchoat(int argc, char **argv) { InitLogging(argv); + MemMap::Init(); const bool debug = kIsDebugBuild; orig_argc = argc; orig_argv = argv; |