carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 08:44:41 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Extract ParseAndExecute as its own library. (#2813)

Browse Source 
Currently ParseAndExecute-style logic is done in main.cpp and a test. #2799 is adding another test that needs it, as is #2811.

Also more clearly marks fuzzing as testing.

This is being extracted out of #2799 in order to try unblocking progress while review continues.
This commit is contained in:
Jon Ross-Perkins
2023-05-12 08:00:43 -07:00
committed by GitHub
parent 681dcfdcef
commit b1ee45c1e4
20 changed files with 226 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/fuzzing/fuzzer_util.cpp
+6 -21
View File
@@ -9,15 +9,12 @@
#include "common/check.h"
#include "common/error.h"
#include "common/fuzzing/proto_to_carbon.h"
#include "explorer/interpreter/exec_program.h"
#include "explorer/interpreter/trace_stream.h"
#include "explorer/syntax/parse.h"
#include "explorer/syntax/prelude.h"
#include "explorer/parse_and_execute/parse_and_execute.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "tools/cpp/runfiles/runfiles.h"
namespace Carbon {
namespace Carbon::Testing {
auto GetRunfilesFile(const std::string& file) -> ErrorOr<std::string> {
using bazel::tools::cpp::runfiles::Runfiles;
@@ -35,26 +32,14 @@ auto GetRunfilesFile(const std::string& file) -> ErrorOr<std::string> {
return full_path;
}
auto ParseAndExecute(const Fuzzing::Carbon& carbon) -> ErrorOr<int> {
const std::string source = ProtoToCarbon(carbon, /*maybe_add_main=*/true);
Arena arena;
CARBON_ASSIGN_OR_RETURN(AST ast,
ParseFromString(&arena, "Fuzzer.carbon", source,
/*parser_debug=*/false));
auto ParseAndExecuteProto(const Fuzzing::Carbon& carbon) -> ErrorOr<int> {
const ErrorOr<std::string> prelude_path =
GetRunfilesFile("carbon/explorer/data/prelude.carbon");
// Can't do anything without a prelude, so it's a fatal error.
CARBON_CHECK(prelude_path.ok()) << prelude_path.error();
AddPrelude(*prelude_path, &arena, &ast.declarations,
&ast.num_prelude_declarations);
TraceStream trace_stream;
// Use llvm::nulls() to suppress output from the Print intrinsic.
CARBON_ASSIGN_OR_RETURN(
ast, AnalyzeProgram(&arena, ast, &trace_stream, &llvm::nulls()));
return ExecProgram(&arena, ast, &trace_stream, &llvm::nulls());
const std::string source = ProtoToCarbon(carbon, /*maybe_add_main=*/true);
return ParseAndExecute(*prelude_path, source);
}
} // namespace Carbon
} // namespace Carbon::Testing