From 4d004fe484dffda698f5139d0076614c7af19ffc Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 4 May 2018 17:35:53 +0100
Subject: [PATCH] Location is correctly a classID and methoID, not two
 objectIDs

---
 renderdoc/android/jdwp.cpp      | 6 +++---
 renderdoc/android/jdwp.h        | 4 ++--
 renderdoc/android/jdwp_util.cpp | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/renderdoc/android/jdwp.cpp b/renderdoc/android/jdwp.cpp
index e921c54c0..a64199da9 100644
--- a/renderdoc/android/jdwp.cpp
+++ b/renderdoc/android/jdwp.cpp
@@ -206,7 +206,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
       Event evData =
           conn.WaitForEvent(EventKind::MethodEntry, {{ModifierKind::ClassOnly, vulkanLoaderClass}},
                             [vulkanLoaderMethod](const Event &evData) {
-                              return evData.MethodEntry.location.methodID == vulkanLoaderMethod;
+                              return evData.MethodEntry.location.meth == vulkanLoaderMethod;
                             });
 
       // if we successfully hit the event, try to inject
@@ -250,7 +250,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
   {
     Event evData = conn.WaitForEvent(EventKind::MethodEntry, {{ModifierKind::ClassOnly, androidApp}},
                                      [appConstruct](const Event &evData) {
-                                       return evData.MethodEntry.location.methodID == appConstruct;
+                                       return evData.MethodEntry.location.meth == appConstruct;
                                      });
 
     if(evData.eventKind == EventKind::MethodEntry)
@@ -323,7 +323,7 @@ bool InjectLibraries(const std::string &deviceID, Network::Socket *sock)
 
     Event evData = conn.WaitForEvent(
         EventKind::MethodEntry, {{ModifierKind::ClassOnly, thisClass.RefType}},
-        [onCreate](const Event &evData) { return evData.MethodEntry.location.methodID == onCreate; });
+        [onCreate](const Event &evData) { return evData.MethodEntry.location.meth == onCreate; });
 
     if(evData.eventKind == EventKind::MethodEntry)
       thread = evData.MethodEntry.thread;
diff --git a/renderdoc/android/jdwp.h b/renderdoc/android/jdwp.h
index f6a119e00..1e4343559 100644
--- a/renderdoc/android/jdwp.h
+++ b/renderdoc/android/jdwp.h
@@ -314,8 +314,8 @@ struct value
 struct Location
 {
   TypeTag tag;
-  objectID classID;
-  objectID methodID;
+  classID clss;
+  methodID meth;
   uint64_t index;
 };
 
diff --git a/renderdoc/android/jdwp_util.cpp b/renderdoc/android/jdwp_util.cpp
index 73ae39364..8c2f06ea5 100644
--- a/renderdoc/android/jdwp_util.cpp
+++ b/renderdoc/android/jdwp_util.cpp
@@ -202,8 +202,8 @@ template <>
 CommandData &CommandData::Read(Location &loc)
 {
   Read((byte &)loc.tag);
-  Read(loc.classID);
-  Read(loc.methodID);
+  Read(loc.clss);
+  Read(loc.meth);
   Read(loc.index);
   return *this;
 }
@@ -212,8 +212,8 @@ template <>
 CommandData &CommandData::Write(const Location &loc)
 {
   Write((const byte &)loc.tag);
-  Write(loc.classID);
-  Write(loc.methodID);
+  Write(loc.clss);
+  Write(loc.meth);
   Write(loc.index);
   return *this;
 }