Merge commit 'a562b01aea87' from apple/master into swift/master-next

git apple-llvm automerger · git apple-llvm automerger · commit ae409ea51f6d · 2019-11-04T09:23:37.000+01:00
diff --git a/lldb/include/lldb/Expression/IRExecutionUnit.h b/lldb/include/lldb/Expression/IRExecutionUnit.h
@@ -307,8 +307,10 @@ class IRExecutionUnit : public std::enable_shared_from_this<IRExecutionUnit>,
       return false;
     }
 
+    // Ignore any EHFrame registration.
     void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,
                           size_t Size) override {}
+    void deregisterEHFrames() override {}
 
     virtual void deregisterEHFrames() override {
       return;

Original file line number	Diff line number	Diff line change
`@@ -307,8 +307,10 @@ class IRExecutionUnit : public std::enable_shared_from_this<IRExecutionUnit>,`
`307`	`307`	`return false;`
`308`	`308`	`}`
`309`	`309`
	`310`	`+ // Ignore any EHFrame registration.`
`310`	`311`	`void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,`
`311`	`312`	`size_t Size) override {}`
	`313`	`+ void deregisterEHFrames() override {}`
`312`	`314`
`313`	`315`	`virtual void deregisterEHFrames() override {`
`314`	`316`	`return;`