From a35912da9f44f7f3b885a4c1f567b1ac672978e1 Mon Sep 17 00:00:00 2001
From: Krasimir Georgiev <krasimir@google.com>
Date: Thu, 18 Oct 2018 03:10:43 +0000
Subject: Revert "Return a named error in the result object of an expression
 with no result"

This reverts commit r344647.
This causes build failures with [-Werror, -Wswitch]. Some cases where the newly
introduced enum value is not handled in particular are in:
  lldb/source/Expression/REPL.cpp:350
  lldb/source/Interpreter/CommandInterpreter.cpp:1529
(maybe there could be more)

As I don't understand lldb to make sure the likely trivial fixes are
correct and also as they might need additional tests, leaving to the
author to resolve.

llvm-svn: 344722
---
 .../test/expression_command/no-result/Makefile     |  6 ---
 .../expression_command/no-result/TestNoResult.py   | 45 ----------------------
 .../test/expression_command/no-result/main.c       |  9 -----
 3 files changed, 60 deletions(-)
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/no-result/Makefile
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/no-result/TestNoResult.py
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/no-result/main.c

(limited to 'lldb/packages/Python/lldbsuite/test/expression_command')

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/no-result/Makefile
deleted file mode 100644
index 50d4ab65a6e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/TestNoResult.py b/lldb/packages/Python/lldbsuite/test/expression_command/no-result/TestNoResult.py
deleted file mode 100644
index 363b30e4de5..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/TestNoResult.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Test that an expression that returns no result returns a sensible error.
-"""
-
-from __future__ import print_function
-
-
-import os
-import time
-import re
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-class TestExprNoResult(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    # If your test case doesn't stress debug info, the
-    # set this to true.  That way it won't be run once for
-    # each debug info format.
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def test_no_result(self):
-        """Run an expression that has no result, check the error."""
-        self.build()
-        self.main_source_file = lldb.SBFileSpec("main.c")
-        self.sample_test()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def sample_test(self):
-        (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self,
-                                   "Set a breakpoint here", self.main_source_file)
-
-        frame = thread.GetFrameAtIndex(0)
-        result = frame.EvaluateExpression("int $x = 10")
-        # No result expressions are considered to fail:
-        self.assertTrue(result.GetError().Fail(), "An expression with no result is a failure.")
-        # But the reason should be eExpressionProducedNoResult
-        self.assertEqual(result.GetError().GetError(), lldb.eExpressionProducedNoResult, 
-                         "But the right kind of failure")
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/no-result/main.c
deleted file mode 100644
index 8d4e0c4f7be..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/no-result/main.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-
-int
-main()
-{
-  int test_var = 10;
-  printf ("Set a breakpoint here: %d.\n", test_var);
-  return 0;
-}
-- 
cgit v1.2.3