diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-05-15 19:16:38 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-05-15 19:16:38 +0800 |
| commit | b9f65d3234026d231b889abded407c4ae1e34286 (patch) | |
| tree | eac3565750dcf593708c972ea40b4954834278a4 /tools/standalone_miri/main.cpp | |
| parent | cee20b8f3ab7fd6eca9fddff712b899064d0536b (diff) | |
| download | mrust-b9f65d3234026d231b889abded407c4ae1e34286.tar.gz | |
standalone_miri - Fix for MIR changes, fiddling with FFI
Diffstat (limited to 'tools/standalone_miri/main.cpp')
| -rw-r--r-- | tools/standalone_miri/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/standalone_miri/main.cpp b/tools/standalone_miri/main.cpp index deed08be..ed9b9267 100644 --- a/tools/standalone_miri/main.cpp +++ b/tools/standalone_miri/main.cpp @@ -74,11 +74,11 @@ int main(int argc, const char* argv[]) // Create argc/argv based on input arguments auto argv_alloc = Allocation::new_alloc((1 + opts.args.size()) * POINTER_SIZE); argv_alloc->write_usize(0 * POINTER_SIZE, 0); - argv_alloc->relocations.push_back({ 0 * POINTER_SIZE, RelocationPtr::new_ffi(FFIPointer { "", (void*)(opts.infile.c_str()), opts.infile.size() + 1 }) }); + argv_alloc->relocations.push_back({ 0 * POINTER_SIZE, RelocationPtr::new_ffi(FFIPointer::new_const_bytes(opts.infile.c_str(), opts.infile.size() + 1)) }); for(size_t i = 0; i < opts.args.size(); i ++) { argv_alloc->write_usize((1 + i) * POINTER_SIZE, 0); - argv_alloc->relocations.push_back({ (1 + i) * POINTER_SIZE, RelocationPtr::new_ffi({ "", (void*)(opts.args[0]), ::std::strlen(opts.args[0]) + 1 }) }); + argv_alloc->relocations.push_back({ (1 + i) * POINTER_SIZE, RelocationPtr::new_ffi(FFIPointer::new_const_bytes(opts.args[0], ::std::strlen(opts.args[0]) + 1)) }); } // Construct argc/argv values |