resolved conflicts for merge of 7c75d915 to master
Change-Id: I25c1dc90af679e2463abffd33ee8838b4727396f
diff --git a/lib/ExecutionEngine/MCCacheReader.cpp b/lib/ExecutionEngine/MCCacheReader.cpp
index 57499b6..5beff88 100644
--- a/lib/ExecutionEngine/MCCacheReader.cpp
+++ b/lib/ExecutionEngine/MCCacheReader.cpp
@@ -449,21 +449,25 @@
}
bool MCCacheReader::readObjFile() {
- llvm::SmallVector<char, 1024> mEmittedELFExecutable;
+ if (mpResult->mCachedELFExecutable.size() != 0) {
+ ALOGE("Attempted to read cached object into a non-empty script");
+ return false;
+ }
char readBuffer[1024];
int readSize;
while ((readSize = mObjFile->read(readBuffer, 1024)) > 0) {
- mEmittedELFExecutable.append(readBuffer, readBuffer + readSize);
+ mpResult->mCachedELFExecutable.append(readBuffer, readBuffer + readSize);
}
if (readSize != 0) {
ALOGE("Read file Error");
return false;
}
- ALOGD("Read object file size %d", (int)mEmittedELFExecutable.size());
+ ALOGD("Read object file size %d", (int)mpResult->mCachedELFExecutable.size());
mpResult->mRSExecutable =
- rsloaderCreateExec((unsigned char *)&*mEmittedELFExecutable.begin(),
- mEmittedELFExecutable.size(),
+ rsloaderCreateExec((unsigned char *)&*(mpResult->mCachedELFExecutable.begin()),
+ mpResult->mCachedELFExecutable.size(),
&resolveSymbolAdapter, this);
+
return true;
}