core: frontend: Relocate frontend and fix bug (#1889)

* core: frontend: Relocate frontend and fix bug

Signed-off-by: Arthur Chan <[email protected]>

* Also remove src fodler

Signed-off-by: Arthur Chan <[email protected]>

---------

Signed-off-by: Arthur Chan <[email protected]>

Author: arthurscchan

oss_fuzz_integration/oss-fuzz-patches.diff

@@ -79,7 +79,7 @@ index d0f45bb73..388563180 100755
    export AR=llvm-ar
    export NM=llvm-nm
    export RANLIB=llvm-ranlib
-@@ -210,10 +220,27 @@ if [ "$SANITIZER" = "introspector" ]; then
+@@ -210,10 +220,26 @@ if [ "$SANITIZER" = "introspector" ]; then
 
    apt-get install -y libjpeg-dev zlib1g-dev libyaml-dev
    python3 -m pip install --upgrade pip setuptools
@@ -90,7 +90,6 @@ index d0f45bb73..388563180 100755
 -  python3 /fuzz-introspector/src/main.py light
 +  # Install Fuzz-Introspector
 +  pushd /fuzz-introspector/src
-+  python3 -m pip install -r /fuzz-introspector/requirements.txt
 +  python3 -m pip install .
 +  popd
 +
@@ -141,7 +140,7 @@ index d0f45bb73..388563180 100755
 +    echo "GOING go route"
 +
 +    # Run the go frontend
-+    python3 -m fuzz_introspector.frontends.src.oss_fuzz --language go --target-dir $SRC
++    python3 -m fuzz_introspector.frontends.oss_fuzz --language go --target-dir $SRC
 +
 +    # Move files temporarily to fix workflow of other languages.
 +    mkdir -p $SRC/my-fi-data
@@ -150,7 +149,7 @@ index d0f45bb73..388563180 100755
    fi
 
    mkdir -p $SRC/inspector
-@@ -335,6 +388,18 @@ if [ "$SANITIZER" = "introspector" ]; then
+@@ -335,6 +388,19 @@ if [ "$SANITIZER" = "introspector" ]; then
      REPORT_ARGS="$REPORT_ARGS --language=jvm"
      python3 /fuzz-introspector/src/main.py report $REPORT_ARGS
      rsync -avu --delete "$SRC/inspector/" "$OUT/inspector"
@@ -162,6 +161,7 @@ index d0f45bb73..388563180 100755
 +    rsync -avu --delete "$SRC/inspector/" "$OUT/inspector"
 +  elif [ "$FUZZING_LANGUAGE" = "go" ]; then
 +    echo "GOING go route"
++    find $OUT/ -name "fuzz.cov" -exec cp {} $SRC/inspector/ \;
 +    REPORT_ARGS="$REPORT_ARGS --target_dir=$SRC/inspector"
 +    REPORT_ARGS="$REPORT_ARGS --language=go"
 +    python3 /fuzz-introspector/src/main.py report $REPORT_ARGS

src/fuzz_introspector/.gitignore

@@ -1,3 +1,6 @@
 __pycache__
 *.txt
 merged_profile.profile
+build
+dist
+*.egg-info

src/fuzz_introspector/frontends/.gitignore

@@ -1 +1,3 @@
 *.yaml
+work/
+fuzzer-calltree-*

…introspector/frontends/src/frontend_c.py …uzz_introspector/frontends/frontend_c.pysrc/fuzz_introspector/frontends/src/frontend_c.py renamed to src/fuzz_introspector/frontends/frontend_c.py src/fuzz_introspector/frontends/src/frontend_c.py renamed to src/fuzz_introspector/frontends/frontend_c.py

@@ -70,7 +70,7 @@ def dump_module_logic(self, report_name):
                 func_dict[
                     'functionLinenumber'] = source_code.root.start_point.row
                 func_dict[
-                    'functionLinbernumberEnd'] = source_code.root.end_point.row
+                    'functionLinenumberEnd'] = source_code.root.end_point.row
                 func_dict['linkageType'] = ''
                 func_dict['func_position'] = {
                     'start': source_code.root.start_point.row,

…trospector/frontends/src/frontend_cpp.py …z_introspector/frontends/frontend_cpp.pysrc/fuzz_introspector/frontends/src/frontend_cpp.py renamed to src/fuzz_introspector/frontends/frontend_cpp.py src/fuzz_introspector/frontends/src/frontend_cpp.py renamed to src/fuzz_introspector/frontends/frontend_cpp.py

@@ -201,7 +201,7 @@ def dump_module_logic(self, report_name: str, entry_function: str = ''):
                 func_dict['functionName'] = func_def.get_name()
                 func_dict['functionSourceFile'] = source_code.source_file
                 func_dict['functionLinenumber'] = func_def.start_line
-                func_dict['functionLinbernumberEnd'] = func_def.end_line
+                func_dict['functionLinenumberEnd'] = func_def.end_line
                 func_dict['linkageType'] = ''
                 func_dict['func_position'] = {
                     'start': func_def.start_line,