aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-05-02 17:26:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-02 17:26:20 +0000
commitc4bcd75dce9a41c1b85e821057d8cf119319bba6 (patch)
treefc7f6fb5844548178b34423fe31551dcad999cbe
parenta790cbb5f678255533040c4edee037c2d0a9325e (diff)
parent7cfda990a33f440e9bf309ef277700fd393094c6 (diff)
downloadbinary_translation-c4bcd75dce9a41c1b85e821057d8cf119319bba6.tar.gz
Merge "Actually prohibit passing arbitrary pointers to Jmp" into main
-rw-r--r--assembler/include/berberis/assembler/x86_64.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/assembler/include/berberis/assembler/x86_64.h b/assembler/include/berberis/assembler/x86_64.h
index 110b55ca..c66cc1c7 100644
--- a/assembler/include/berberis/assembler/x86_64.h
+++ b/assembler/include/berberis/assembler/x86_64.h
@@ -179,7 +179,7 @@ class Assembler : public AssemblerX86<Assembler> {
// Make sure only type void* can be passed to function below, not Label* or any other type.
template <typename T>
- auto Jmp(Condition cc, T* target) -> void = delete;
+ auto Jmp(T* target) -> void = delete;
void Jmp(const void* target) {
// There are no jump instruction with properties we need thus we emulate it.