Merge pull request #1192 from peterschrammel/various-fixes

Various small fixes

Author: tautschnig

regression/cpp/pointer_to_member_conversion1/main.cpp

@@ -0,0 +1,30 @@
+class B
+{
+};
+
+class D: public B
+{
+public:
+  int x;
+};
+
+class E
+{
+public:
+  int y;
+};
+
+
+int main(int argc, char** argv)
+{
+  int B::* xptr=static_cast<int B::*>(&D::x);
+#if 0
+  B b;
+  b.*xptr; // undefined
+#endif
+
+  D d;
+  d.*xptr; // valid
+
+  return 0;
+}

regression/cpp/pointer_to_member_conversion1/test.desc

@@ -0,0 +1,10 @@
+KNOWNBUG
+main.cpp
+
+^EXIT=0$
+^SIGNAL=0$
+^VERIFICATION SUCCESSFUL$
+--
+^warning: ignoring
+--
+should exercise cpp_typecheckt::standard_conversion_pointer_to_member, cpp/cpp_typecheck_conversion.cpp:610 once other bugs are fixed

regression/cpp/pointer_to_member_conversion2/main.cpp

@@ -0,0 +1,30 @@
+class B
+{
+};
+
+class D: public B
+{
+public:
+  int x;
+};
+
+class E
+{
+public:
+  int y;
+};
+
+
+int main(int argc, char** argv)
+{
+  int B::* xptr=static_cast<int B::*>(&D::x);
+#if 0
+  B b;
+  b.*xptr; // undefined
+#endif
+
+  E e;
+  e.*xptr; // compiler error
+
+  return 0;
+}

regression/cpp/pointer_to_member_conversion2/test.desc

@@ -0,0 +1,11 @@
+KNOWNBUG
+main.cpp
+
+^EXIT=(64|1)$
+^SIGNAL=0$
+invalid implicit conversion
+^CONVERSION ERROR$
+--
+^warning: ignoring
+--
+should exercise cpp_typecheckt::standard_conversion_pointer_to_member, cpp/cpp_typecheck_conversion.cpp:610 once other bugs are fixed

scripts/cpplint.py

@@ -6516,6 +6516,9 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
   if Search(r'_builtin_headers(_[a-z0-9_-]+)?\.h$', filename):
     return
 
+  if Search(r'regression/.*\.cpp', filename):
+    return
+
   if not ProcessConfigOverrides(filename):
     _RestoreFilters()
     return

src/goto-instrument/wmm/instrumenter_strategies.cpp

@@ -136,10 +136,10 @@ void inline instrumentert::instrument_one_event_per_cycle_inserter(
       continue;
 
     /* instruments the first pair */
-    for(std::set<event_grapht::critical_cyclet::delayt>::iterator
-      p_it=it->unsafe_pairs.begin();
-      p_it!=it->unsafe_pairs.end(); ++p_it)
+    if(!it->unsafe_pairs.empty())
     {
+      std::set<event_grapht::critical_cyclet::delayt>::iterator
+        p_it=it->unsafe_pairs.begin();
       delayed.insert(*p_it);
       const abstract_eventt &first_ev=egraph[p_it->first];
       var_to_instr.insert(first_ev.variable);
@@ -154,7 +154,6 @@ void inline instrumentert::instrument_one_event_per_cycle_inserter(
           std::pair<irep_idt, source_locationt>(
             second_ev.variable, second_ev.source_location));
       }
-      break;
     }
   }
 }