check for local_var.h

Author: lee218llnl

ChangeLog

@@ -1,6 +1,6 @@
 2022-09-16 Gregory L. Lee <[email protected]>
-	* : Add support for dyninst 12+ (remove local variable gathering). This
-	means python frames cannot be gathered.
+	* : Add check for local_var.h (removed in dyninst 12)
+	can copy local_var.h from older dyninst if needed (python debugging)
 
 2022-08-22 Gregory L. Lee <[email protected]>
 	* : updated version string to 4.2.0

config/x_ac_debuglibs.m4

@@ -8,7 +8,7 @@ AC_DEFUN([X_AC_DEBUGLIBS], [
      RPATH_FLAGS="$RPATH_FLAGS -Wl,-rpath=/usr/lib64/dyninst"],
     [CXXFLAGS="$CXXFLAGS"
      STACKWALKERPREFIX="${withval}"]
-  )  
+  )
 
   AC_ARG_WITH(elfutils,
     [AS_HELP_STRING([--with-elfutils=prefix],
@@ -114,34 +114,12 @@ AC_DEFUN([X_AC_DEBUGLIBS], [
   fi
   AC_MSG_RESULT([$dyninst_vers_10])
 
-  AC_MSG_CHECKING([Checking Dyninst Version 12.0 or greater])
-  dyninst_vers_12=no
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include "dyninstversion.h"
-    int main()
-    {
-      return 0;
-    }])],
-    [dyninst_vers_12=yes],
-    []
+  AC_CHECK_HEADER(local_var.h,
+    [AC_DEFINE([LOCAL_VAR_H], [], [local_var.h])],
+    [],
+    AC_INCLUDES_DEFAULT
   )
 
-  if test "$dyninst_vers_12" = yes; then
-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include "dyninstversion.h"
-      #if DYNINST_MAJOR_VERSION < 12
-        #error
-      #endif
-      int main()
-      {
-        return 0;
-      }])],
-      [CXXFLAGS="$CXXFLAGS -std=c++11"],
-      [dyninst_vers_12=no]
-    )
-  fi
-  AC_MSG_RESULT([$dyninst_vers_12])
-
-
-
   AC_CHECK_HEADER(Symtab.h,
     [],
     [AC_MSG_ERROR([Symtab.h is required.  Specify prefix with --with-stackwalker])],

src/STAT_BackEnd.C

@@ -1889,7 +1889,7 @@ StatError_t STAT_BackEnd::getVariable(const Frame &frame, char *variableName, ch
     vector<localVar *> vars;
     vector<localVar *>::iterator varsIter;
 
-#if DYNINST_MAJOR_VERSION<12
+#ifdef LOCAL_VAR_H
     frame.getName(frameName);
     printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "Searching for variable %s in frame %s\n", variableName, frameName.c_str());
 
@@ -1939,8 +1939,8 @@ StatError_t STAT_BackEnd::getVariable(const Frame &frame, char *variableName, ch
         }
     }
     printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "Found variable %s in frame %s\n", variableName, frameName.c_str());
-#else //#if DYNINST_MAJOR_VERSION<12
-    printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "local variable support not availabile with dyninst 12 and greater\n");
+#else //#ifdef LOCAL_VAR_H
+    printMsg(STAT_LOG_MESSAGE, __FILE__, __LINE__, "local variable header not found\n");
 #endif
     return STAT_OK;
 }

src/STAT_BackEnd.h

@@ -57,7 +57,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include "swk_errors.h"
 #include "Type.h"
 
-#if DYNINST_MAJOR_VERSION<12
+#ifdef LOCAL_VAR_H
   #include "local_var.h"
 #endif
 #include "Variable.h"