From: Richard Henderson <rth@redhat.com>
Date: Wed, 31 May 2017 17:16:57 +0000 (-0700)
Subject: Fix buildok/nfs_proc-detailed.stp
X-Git-Tag: post-bpf-merge^2~5^2~35
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=92fe99d711c384a3055499cdd329dcc442cc0d2f;p=systemtap.git

Fix buildok/nfs_proc-detailed.stp
---

diff --git a/dwflpp.cxx b/dwflpp.cxx
index 030edc56f..4efe8ee61 100644
--- a/dwflpp.cxx
+++ b/dwflpp.cxx
@@ -3620,37 +3620,48 @@ dwflpp::translate_final_fetch_or_store (location_context &ctx,
     case DW_TAG_enumeration_type:
       // Reject types we can't handle in systemtap
       {
-        Dwarf_Attribute encoding_attr;
-        Dwarf_Word encoding = (Dwarf_Word) -1;
-        dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_encoding, &encoding_attr),
-                         & encoding);
-        if (encoding == (Dwarf_Word) -1)
-          {
-            // clog << "bad type1 " << encoding << " diestr" << endl;
-            throw SEMANTIC_ERROR (_F("unsupported type (mystery encoding %s for %s",
-				  lex_cast(encoding).c_str(),
-                                  dwarf_type_name(typedie).c_str()), e->tok);
-          }
+        bool signed_p = false;
 
-        if (encoding == DW_ATE_float
-            || encoding == DW_ATE_complex_float
-            /* XXX || many others? */)
-          {
-            // clog << "bad type " << encoding << " diestr" << endl;
-            throw SEMANTIC_ERROR (_F("unsupported type (encoding %s) for %s",
-				     lex_cast(encoding).c_str(),
-				     dwarf_type_name(typedie).c_str()), e->tok);
-          }
+        if (typetag == DW_TAG_base_type)
+	  {
+            Dwarf_Attribute encoding_attr;
+            Dwarf_Word encoding = (Dwarf_Word) -1;
+
+	    dwarf_formudata (dwarf_attr_integrate (typedie, DW_AT_encoding,
+						   &encoding_attr), &encoding);
+	    if (encoding == (Dwarf_Word) -1)
+	      {
+		throw (SEMANTIC_ERROR
+		       (_F("unsupported type (mystery encoding %s for %s",
+			   lex_cast(encoding).c_str(),
+                           dwarf_type_name(typedie).c_str()), e->tok));
+	      }
+
+	    if (encoding == DW_ATE_float
+	        || encoding == DW_ATE_complex_float
+	        /* XXX || many others? */)
+	      {
+		throw (SEMANTIC_ERROR
+		       (_F("unsupported type (encoding %s) for %s",
+			   lex_cast(encoding).c_str(),
+			   dwarf_type_name(typedie).c_str()), e->tok));
+	      }
+
+	    signed_p = (encoding == DW_ATE_signed
+			|| encoding == DW_ATE_signed_char);
+	  }
 
 	Dwarf_Attribute size_attr;
 	Dwarf_Word byte_size;
 	if (dwarf_attr_integrate (typedie, DW_AT_byte_size, &size_attr) == NULL
 	    || dwarf_formudata (&size_attr, &byte_size) != 0)
-	  throw SEMANTIC_ERROR (_F("cannot get byte_size attribute for type %s: %s",
-				   dwarf_diename (typedie) ?: "<anonymous>",
-				   dwarf_errmsg (-1)), e->tok);
+	  {
+	    throw (SEMANTIC_ERROR
+		   (_F("cannot get byte_size attribute for type %s: %s",
+		       dwarf_diename (typedie) ?: "<anonymous>",
+		       dwarf_errmsg (-1)), e->tok));
+	  }
 
-	bool signed_p = encoding == DW_ATE_signed || encoding == DW_ATE_signed_char;
         translate_base_ref (ctx, byte_size, signed_p);
       }
       break;