Merge commit 'df12a75a1968' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit a562b01aea87 · 2019-11-04T09:23:37.000+01:00
diff --git a/lldb/include/lldb/Expression/IRExecutionUnit.h b/lldb/include/lldb/Expression/IRExecutionUnit.h
@@ -298,8 +298,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 {}
 
     uint64_t getSymbolAddress(const std::string &Name) override;
     

Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,10 @@ class IRExecutionUnit : public std::enable_shared_from_this<IRExecutionUnit>,`
`298`	`298`	`return false;`
`299`	`299`	`}`
`300`	`300`
	`301`	`+ // Ignore any EHFrame registration.`
`301`	`302`	`void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr,`
`302`	`303`	`size_t Size) override {}`
	`304`	`+ void deregisterEHFrames() override {}`
`303`	`305`
`304`	`306`	`uint64_t getSymbolAddress(const std::string &Name) override;`
`305`	`307`