[lld] r326885 - [WebAssembly] Use StringSaver to retain ownership of ctor function body. NFC
Nicholas Wilson via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 7 02:37:50 PST 2018
Author: ncw
Date: Wed Mar 7 02:37:50 2018
New Revision: 326885
URL: http://llvm.org/viewvc/llvm-project?rev=326885&view=rev
Log:
[WebAssembly] Use StringSaver to retain ownership of ctor function body. NFC
Differential Revision: https://reviews.llvm.org/D44149
Modified:
lld/trunk/wasm/InputChunks.h
lld/trunk/wasm/Writer.cpp
Modified: lld/trunk/wasm/InputChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/InputChunks.h?rev=326885&r1=326884&r2=326885&view=diff
==============================================================================
--- lld/trunk/wasm/InputChunks.h (original)
+++ lld/trunk/wasm/InputChunks.h Wed Mar 7 02:37:50 2018
@@ -24,7 +24,6 @@
#include "Config.h"
#include "InputFiles.h"
#include "lld/Common/ErrorHandler.h"
-#include "lld/Common/Strings.h"
#include "llvm/Object/Wasm.h"
using llvm::object::WasmSegment;
@@ -152,16 +151,18 @@ protected:
class SyntheticFunction : public InputFunction {
public:
- SyntheticFunction(const WasmSignature &S, std::string Body, StringRef Name)
- : InputFunction(S, nullptr, nullptr), Name(Name), Body(std::move(Body)) {}
+ SyntheticFunction(const WasmSignature &S, ArrayRef<uint8_t> Body,
+ StringRef Name)
+ : InputFunction(S, nullptr, nullptr), Name(Name), Body(Body) {}
StringRef getName() const override { return Name; }
+ StringRef getComdat() const override { return StringRef(); }
protected:
- ArrayRef<uint8_t> data() const override { return toArrayRef(Body); }
+ ArrayRef<uint8_t> data() const override { return Body; }
StringRef Name;
- std::string Body;
+ ArrayRef<uint8_t> Body;
};
} // namespace wasm
Modified: lld/trunk/wasm/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/wasm/Writer.cpp?rev=326885&r1=326884&r2=326885&view=diff
==============================================================================
--- lld/trunk/wasm/Writer.cpp (original)
+++ lld/trunk/wasm/Writer.cpp Wed Mar 7 02:37:50 2018
@@ -17,6 +17,7 @@
#include "WriterUtils.h"
#include "lld/Common/ErrorHandler.h"
#include "lld/Common/Memory.h"
+#include "lld/Common/Strings.h"
#include "lld/Common/Threads.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/BinaryFormat/Wasm.h"
@@ -873,7 +874,8 @@ void Writer::createCtorFunction() {
const WasmSignature *Sig = WasmSym::CallCtors->getFunctionType();
SyntheticFunction *F = make<SyntheticFunction>(
- *Sig, std::move(FunctionBody), WasmSym::CallCtors->getName());
+ *Sig, toArrayRef(Saver.save(FunctionBody)),
+ WasmSym::CallCtors->getName());
F->setOutputIndex(FunctionIndex);
F->Live = true;
More information about the llvm-commits
mailing list