merge strategy-concept -> development

blipper · Jan 6, 2020 · 3d498d4 · 3d498d4
1 parent a3bbcd8
commit 3d498d4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -2,7 +2,7 @@
 Phasar Release License (MIT license)
 ===============================================================================
 
-Copyright (c) 2017 - 2019 Philipp Schubert and others
+Copyright (c) 2017 - 2020 Philipp Schubert and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ PhASAR a LLVM-based Static Analysis Framework
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/c944f18c7960488798a0728db9380eb5)](https://app.codacy.com/app/pdschubert/phasar?utm_source=github.com&utm_medium=referral&utm_content=secure-software-engineering/phasar&utm_campaign=Badge_Grade_Dashboard)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/secure-software-engineering/phasar/master/LICENSE.txt)
 
-Version 0619
+Version 0120
 
 Secure Software Engineering Group
 ---------------------------------

diff --git a/include/phasar/Config/Version.h b/include/phasar/Config/Version.h
@@ -1 +1 @@
-#define PHASAR_VERSION v0619
+#define PHASAR_VERSION v0120
diff --git a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
@@ -80,7 +80,7 @@ GeneralStatisticsAnalysis::run(llvm::Module &M,
         }
         // check for load instructions
         if (llvm::isa<llvm::LoadInst>(I)) {
-          ++loadInstructions;
+          ++Stats.loadInstructions;
         }
         // check for llvm's memory intrinsics
         if (llvm::isa<llvm::MemIntrinsic>(I)) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define PHASAR_VERSION v0619
		#define PHASAR_VERSION v0120